Changeset 1532 for trunk/src/org/expeditee/gio/gesture/StandardGestureActions.java

Timestamp:

08/31/20 16:26:59 (4 years ago)

Author:

bnemhaus

Message:

New feature: when creating a frameset, if the item being used is linked and you hold shift, it will use the items on the linked frame to populate the zero frame of the new frameset

File:

• trunk/src/org/expeditee/gio/gesture/StandardGestureActions.java (modified) (4 diffs)

trunk/src/org/expeditee/gio/gesture/StandardGestureActions.java

@@ -669 +669 @@
                                 ItemSpecificGestureData data = (ItemSpecificGestureData) gesture.getData();
                                 if (data.getCurrentItem() != null) {
-                                        CreateFrameset(data.getCurrentItem());
+                                        CreateFrameset(data.getCurrentItem(), data.isShiftDown());
                                 }
                         }
@@ -2947 +2947 @@
         /**
          * Creates a new Frameset with the name given by the Item
-         * 
-         * @param name
+         * @param useLinkForZeroFrame if true, will try to use the content from 
+         * the frame specified by the link as the zero frame for new frameset 
          */
-        private static void CreateFrameset(Item item) {
+        private static void CreateFrameset(Item item, boolean useLinkForZeroFrame) {
                 if (item == null) {
                         MessageBay.displayMessage("There is no selected item to use for the frameset name");
@@ -2961 +2961 @@
                 }
 
+                // Collect Items to place on new zero frame.
+                Collection<Item> zeroLinkItems = null; 
                 // Don't create frameset if the item is linked
-                if (item.getLink() != null) {
-                        MessageBay.displayMessage("A frameset can not be created from a linked item");
+                if (item.getLink() != null && !useLinkForZeroFrame) {
+                        MessageBay.displayMessage("A frameset can not be created from a linked item without holding shift.  Hold shift while pressing F6 to use items on linked frame to populate zero frame.");
                         return;
+                } else if (item.getLink() != null && useLinkForZeroFrame) {
+                        Frame frameToUseForZeroFrameCreation = FrameIO.LoadFrame(item.getLink());
+                        if (frameToUseForZeroFrameCreation != null) {
+                                zeroLinkItems = frameToUseForZeroFrameCreation.getBody(true).cloneList();
+                        }
                 }
 
@@ -2980 +2987 @@
                                 String groupName = name.substring(7);
                                 // create the new group
-                                linkTo = FrameIO.CreateNewGroup(groupName);
+                                linkTo = FrameIO.CreateNewGroup(groupName, zeroLinkItems);
                         } else {
                                 // create the new frameset
-                                linkTo = FrameIO.CreateNewFrameset(name);
+                                linkTo = FrameIO.CreateNewFrameset(name, zeroLinkItems);
                         }
                         DisplayController.setCursor(Item.DEFAULT_CURSOR);