Changeset 690

Timestamp:

01/14/14 10:09:38 (10 years ago)

Author:

ngw8

Message:

Modified message bay progress bar unicode characters to work properly. Added progress bar to web page parser

Location:

trunk/src/org/expeditee

Files:

• gui/MessageBay.java (modified) (3 diffs)
• io/WebParser.java (modified) (5 diffs)

trunk/src/org/expeditee/gui/MessageBay.java

@@ -446 +446 @@
         public static final class Progress {
                 
-                private static final String t = "▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓";
-                private static final String f = "░░░░░░░░░░░░░░░░░░░░";
+                private static final String filled = "\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592\u2592";
+                private static final String unfilled = "\u2591\u2591\u2591\u2591\u2591\u2591\u2591\u2591\u2591\u2591\u2591\u2591\u2591\u2591\u2591\u2591\u2591\u2591\u2591\u2591";
                 
                 String message;
@@ -456 +456 @@
                         //this.text.setFont(Font.decode(Text.MONOSPACED_FONT + "-16"));
                         this.message = this.text.getText();
-                        this.text.setText(this.message + " [" + f + "] 0%");
+                        this.text.setText(this.message + " [" + unfilled + "] 0%");
                         refresh(false, FrameGraphics.createGraphics(), Item.DEFAULT_BACKGROUND);
                 }
@@ -470 +470 @@
                         int p = progress / 5;
                         if(isMessageItem(this.text)) {
-                                this.text.setText(this.message + " [" + t.substring(0, p) + f.substring(p) + "] " + progress + "%");
+                                this.text.setText(this.message + " [" + filled.substring(0, p) + unfilled.substring(p) + "] " + progress + "%");
                                 refresh(false, FrameGraphics.createGraphics(), Item.DEFAULT_BACKGROUND);
                                 return true;

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

@@ -20 +20 @@
 import org.expeditee.gui.FrameUtils;
 import org.expeditee.gui.MessageBay;
+import org.expeditee.gui.MessageBay.Progress;
 import org.expeditee.items.ItemUtils;
 import org.expeditee.items.Justification;
@@ -131 +132 @@
                                 public void run() {
                                         try {
+                                                Progress progressBar = MessageBay.displayProgress("Converting web page");
+
                                                 HTMLBodyElement doc = (HTMLBodyElement) JavaFX.WebEngineExecuteScript.invoke(webEngine, "document.body");
 
                                                 Object window = JavaFX.WebEngineExecuteScript.invoke(webEngine, "window");
+                                                
+                                                JavaFX.WebEngineExecuteScript.invoke(webEngine, ""
+                                                                + "var css = 'h1 { background: red; }';" // TODO
+                                                                + "var head = document.head;"
+                                                                + "style = document.createElement('style');"
+                                                                + "style.type = 'text/css';"
+                                                                + "if (style.styleSheet){"
+                                                                + "             style.styleSheet.cssText = css;"
+                                                                + "} "
+                                                                + "else {"
+                                                                + "             style.appendChild(document.createTextNode(css));"
+                                                                + "}"
+                                                                + "head.appendChild(style);"
+                                                                );
 
                                                 frame.setBackgroundColor(rgbStringToColor((String) JavaFX.JSObjectCall.invoke(JavaFX.JSObjectCall.invoke(window, "getComputedStyle", new Object[] { doc }), "getPropertyValue",
@@ -168 +185 @@
 
                                                 for (int i = 0; i < contentElementsLength; i++) {
-                                                        System.out.println(i + "/" + contentElementsLength);
                                                         // Getting the current HTML element, then making it accessible in JavaScript
                                                         Element currentElement = (Element) JavaFX.JSObjectGetSlot.invoke(contentElements, i);
@@ -224 +240 @@
                                                         }
 
+                                                        progressBar.set((100 * (i + 1)) / contentElementsLength);
                                                 }
                                                 
@@ -252 +269 @@
                                                                 
                                                                 // Bounding rectangle position is relative to the current view, so scroll position must be added to x/y
+                                                                // 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
                                                                 float x = Float.valueOf(JavaFX.JSObjectGetMember.invoke(bounds, "left").toString())
                                                                                 + Float.valueOf(JavaFX.WebEngineExecuteScript.invoke(webEngine, "window.pageXOffset").toString());