Changeset 842

Timestamp:

02/05/14 15:28:49 (10 years ago)

Author:

ngw8

Message:

Slight change to web parser next/previous/index button positions.
Added button to return to the page that the JFXBrowser was on.

File:

• trunk/src/org/expeditee/io/WebParser.java (modified) (3 diffs)

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

@@ -311 +311 @@
                         frameset.getTitleItem().setSize(14);
 
+                        WebParser.addButton("Return to original frame", frame.getName(), null, 200, frameset, null, 0f, 10f, null);
+
+
                         Text link = DisplayIO.getCurrentFrame().addText(FrameMouseActions.getX(), FrameMouseActions.getY(), webEngine.getTitle(), null);
                         link.setLink(frameset.getName());
@@ -386 +389 @@
 
                                                         // Button to go to the next frame/page
-                                                        Text nextButton = new Text("Next");
-
-                                                        nextButton.addAction("next");
-                                                        nextButton.setBorderColor(new Color(0.7f, 0.7f, 0.7f));
-                                                        nextButton.setBackgroundColor(new Color(0.9f, 0.9f, 0.9f));
-                                                        nextButton.setThickness(1);
-                                                        nextButton.setActionMark(false);
-                                                        nextButton.setWidth(70);
-                                                        nextButton.setFamily("Roboto Condensed Light");
-                                                        nextButton.setJustification(Justification.center);
-                                                        nextButton.setAnchorRight(10f);
-                                                        nextButton.setAnchorBottom(10f);
-
-                                                        nextButton.setID(frameToAddTo.getNextItemID());
-                                                        frameToAddTo.addItem(nextButton);
+                                                        WebParser.addButton("Next", null, "next", 70, frameToAddTo, null, 0f, 10f, null);
 
                                                         // Button to go to the previous frame/page
-                                                        if (verticalCount.getValue() > 1) {
-                                                                Text previousButton = nextButton.copy();
-                                                                previousButton.setText("Previous");
-                                                                previousButton.setAction("previous");
-                                                                previousButton.setAnchorRight(180f);
-                                                                previousButton.setAnchorBottom(10f);
-
-                                                                frameToAddTo.addItem(previousButton);
+                                                        if (verticalCount.getValue() > 1 || horizontalCount.getValue() > 0) {
+                                                                WebParser.addButton("Previous", null, "previous", 70, frameToAddTo, null, 85f, 10f, null);
                                                         }
 
                                                         // Button to return to the index/overview page
-                                                        Text indexButton = nextButton.copy();
-                                                        indexButton.setText("Index");
-                                                        indexButton.setAction(null);
-                                                        indexButton.setLink(frameset.getName());
-                                                        indexButton.setLinkMark(false);
-                                                        indexButton.setAnchorRight(95f);
-                                                        indexButton.setAnchorBottom(10f);
-
-                                                        frameToAddTo.addItem(indexButton);
+                                                        WebParser.addButton("Index", frameset.getName(), null, 70, frameToAddTo, null, null, 10f, 5f);
 
                                                         FrameIO.SaveFrame(frameToAddTo);
@@ -1391 +1366 @@
         }
 
+        /**
+         * Used by the web parser to add Next, Previous, etc. buttons to the converted pages
+         * 
+         * @param text
+         *            text to display on the button
+         * @param link
+         *            Frame that the button will link to
+         * @param action
+         *            Action to run when button is clicked
+         * @param width
+         *            Width of the button
+         * @param toAddTo
+         *            Frame to add the button to
+         * @param anchorTop
+         * @param anchorRight
+         * @param anchorBottom
+         * @param anchorLeft
+         */
+        private static void addButton(String text, String link, String action, int width, Frame toAddTo, Float anchorTop, Float anchorRight, Float anchorBottom, Float anchorLeft) {
+                // Button to go to the next frame/page
+                Text button = new Text(text);
+
+                button.setLink(link);
+                button.addAction(action);
+                button.setBorderColor(new Color(0.7f, 0.7f, 0.7f));
+                button.setBackgroundColor(new Color(0.9f, 0.9f, 0.9f));
+                button.setThickness(1);
+                button.setLinkMark(false);
+                button.setActionMark(false);
+                button.setFamily("Roboto Condensed Light");
+                button.setJustification(Justification.center);
+                button.setWidth(width);
+
+                if (anchorTop != null) {
+                        button.setAnchorTop(anchorTop);
+                }
+
+                if (anchorRight != null) {
+                        button.setAnchorRight(anchorRight);
+                }
+
+                if (anchorBottom != null) {
+                        button.setAnchorBottom(anchorBottom);
+                }
+
+                if (anchorLeft != null) {
+                        button.setAnchorLeft(anchorLeft);
+                }
+
+                button.setID(toAddTo.getNextItemID());
+                toAddTo.addItem(button);
+
+        }
+
+
         private static class MutableBool {
                 private boolean value;