Changeset 766 for trunk/src/org/expeditee/actions

Timestamp:

01/28/14 16:46:08 (10 years ago)

Author:

csl14

Message:

Added Exploratory Search settings package; can now specify height and width or fullscreen mode for JfxBrowser and specify whitespace margins

Location:

trunk/src/org/expeditee/actions

Files:

• ExploratorySearchActions.java (added)
• JfxBrowserActions.java (modified) (4 diffs)
• Misc.java (modified) (1 diff)

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

@@ -25 +25 @@
         /**
          * Launches items.widgets.JfxBrowser and uses Text item as URL.
-         * Note: currently doesn't work
          * @param text Text item which passes contents as URL for browser.
          * @throws Exception
@@ -59 +58 @@
         /**
          * Text item becomes link to new frame containing items.widgets.JfxBrowser and uses Text item as URL for browser.
-         * Note: currently doesn't work
          * @param text Text item which passes contents as URL for browser and becomes link to the browser's new frame.
          * @throws Exception
@@ -86 +84 @@
                 // Create widget via text annotation
                 Text wt = frame.addText(0, JfxBrowser.VERT_OFFSET, "@iw: org.expeditee.items.widgets.JfxBrowser "+ (Browser._theBrowser.getWidth() - JfxBrowser.HORZ_CROP)+ 
-                                 " " + (Browser._theBrowser.getHeight() - JfxBrowser.VERT_CROP) + " : ".concat(text.getText()), null);
+                                 " " + (Browser._theBrowser.getHeight() - JfxBrowser.VERT_CROP - JfxBrowser.VERT_OFFSET) + " : ".concat(text.getText()), null);
                 InteractiveWidget.createWidget(wt);
                 
@@ -111 +109 @@
         }
         
-        /**
-         * Adds a text item to the cursor which is linked to a new frame with the web browser active overlay and a JavaFX browser.
-         * @param text The text item attached to the cursor.
-         */
-        public static void startBrowserSession(Text text) {
-                try {
-                        if (!(text instanceof Text)) {
-                                MessageBay.errorMessage("Must be a text item.");
-                                return;
-                        }
-                        
-                        if(text.getLink() != null) {                                            // text item can't already have a link
-                                MessageBay.errorMessage("Text item already has link.");
-                                return;
-                        }
-                        
-                        String url = "";
-                        
-                        // If no text with url is passed to action create a new text item
-                        if(!FreeItems.textOnlyAttachedToCursor()) {
-                                url = NetworkSettings.HomePage.get();                                   // use home page specified by settings
-                                text = DisplayIO.getCurrentFrame().addText(FrameMouseActions.getX(), FrameMouseActions.getY(), 
-                                                "Web Browser Session", null);
-                                text.setParent(DisplayIO.getCurrentFrame());
-                                FrameMouseActions.pickup(text);
-                        } else {
-                                url = text.getText();                                                   // get url from text attached to cursor if possible
-                        }
-                        
-                        // Set text to session id. TODO: set session id.
-                        text.setText("Web Browser Session");
-                        
-                        // Create new frame
-                        Frame frame = FrameIO.CreateNewFrame(text);
-                        text.setLink("" + frame.getNumber());                           // link this text item to new frame
-                        
-                        // Remove everything from new page
-                        frame.removeAllItems(frame.getItems());
-                        
-                        // Add web browser active overlay
-                        frame.addText(1100, 50, "@ao: 2", null, "overlayset2");
-                        // Add @old
-                        frame.addText(1100, 20, "@old", null);
-                        
-                        // Create widget via text annotation
-                        Text wt = frame.addText(0, 80, "@iw: org.expeditee.items.widgets.JfxBrowser "+ (Browser._theBrowser.getWidth() - JfxBrowser.HORZ_CROP)+ 
-                                         " " + (Browser._theBrowser.getHeight() - JfxBrowser.VERT_CROP) + " : ".concat(url), null);
-                        InteractiveWidget.createWidget(wt);
-                        
-                        FrameIO.SaveFrame(frame);                                                       // save frame to disk
-                } catch(Exception e) {
-                        e.printStackTrace();
-                }
-        }
-        
         public static void gotoURL(Text link, String URL) {
                 Frame frame = FrameIO.CreateNewFrame(link);

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

@@ -1177 +1177 @@
                 FrameUtils.CreateDefaultProfile(UserSettings.UserName.get(), homeFrame);
         }
-
-        /**
-         * Adds a text item to the cursor which is linked to a new frame with the mindmap active overlay.
-         */
-        public static void startMindmapSession() {
-                // Replace any text item on cursor with link to a new mindmap
-                FreeItems.getInstance().clear();
-                Text text = DisplayIO.getCurrentFrame().addText(FrameMouseActions.getX(), FrameMouseActions.getY(), "Mindmap Session", null);
-                text.setParent(DisplayIO.getCurrentFrame());
-                FrameMouseActions.pickup(text);
-                Frame frame = FrameIO.CreateNewFrame(text);
-                text.setLink("" + frame.getNumber());
-                
-                // Clear new frame and add active overlay and @old
-                frame.removeAllItems(frame.getItems());
-                frame.addText(1100, 50, "@ao: 2", null, "overlayset3");
-                frame.addText(1100, 20, "@old", null);
-                
-                FrameIO.SaveFrame(frame);
-        }
         
         /**