Changeset 845

Timestamp:

02/05/14 15:57:58 (10 years ago)

Author:

ngw8

Message:

Web parser now gives converted links an action that creates a new frame containing a web browser with the appropriate URL

Location:

trunk/src/org/expeditee

Files:

• actions/JfxBrowserActions.java (modified) (3 diffs)
• io/WebParser.java (modified) (1 diff)

trunk/src/org/expeditee/actions/JfxBrowserActions.java

@@ -4 +4 @@
 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;
+import org.expeditee.gui.FrameUtils;
 import org.expeditee.gui.FreeItems;
 import org.expeditee.gui.MessageBay;
@@ -12 +14 @@
 import org.expeditee.items.Text;
 import org.expeditee.items.widgets.InteractiveWidget;
+import org.expeditee.items.widgets.InteractiveWidgetInitialisationFailedException;
+import org.expeditee.items.widgets.InteractiveWidgetNotAvailableException;
 import org.expeditee.items.widgets.JfxBrowser;
 import org.expeditee.settings.network.NetworkSettings;
@@ -125 +129 @@
                 FrameIO.SaveFrame(frame);
         }
+
+        /**
+         * Creates a frame containing a JFXBrowser pointed to the specified URL, then navigates to that frame
+         * 
+         * @param link
+         *            Item that will link to the new frame
+         * @param url
+         *            URL to load in the Web Browser of the new frame
+         * @throws Exception
+         */
+        public static void createFrameWithBrowser(Text link, String url) throws Exception {
+                Frame frame = FrameIO.CreateNewFrame(link);
+                frame.removeAllItems(frame.getItems());
+                link.setLink("" + frame.getNumber());
+                link.setAction(null);
+
+                // Create widget via text annotation
+                Text wt = frame.addText(10, 10, "@iw: org.expeditee.items.widgets.JfxBrowser " + (int) (FrameGraphics.getMaxFrameSize().getWidth() * 0.9) + " "
+                                + (int) (FrameGraphics.getMaxFrameSize().getHeight() * 0.9) + " : " + url, null);
+
+                InteractiveWidget.createWidget(wt);
+
+                FrameIO.SaveFrame(frame);
+
+                FrameUtils.DisplayFrame(link.getAbsoluteLink());
+        }
 }

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

@@ -1359 +1359 @@
 
                                 if (!linkUrl.equals("undefined")) {
-                                        t.setAction("gotourl " + linkUrl);
+                                        t.setAction("createFrameWithBrowser " + linkUrl);
                                         t.setActionMark(false);
                                 }