Ticket #2310: pagereorder.patch

src/main/java/org/sophie2/main/app/layout/left/pages/PagePreviewPaletteLogic.java

@@ -6 +6 @@
 import org.sophie2.base.commons.util.position.ImmRect;
 import org.sophie2.base.dialogs.DialogManager;
 import org.sophie2.base.dnd.DndData;
+import org.sophie2.base.dnd.DndTransferable;
 import org.sophie2.base.dnd.SophieDragDropHandler;
+import org.sophie2.base.dnd.SophieTransferable;
+import org.sophie2.base.dnd.SophieDragDropHandler.DndExport;
 import org.sophie2.base.dnd.SophieDragDropHandler.DndImport;
 import org.sophie2.base.dnd.SophieDragDropHandler.DndPreImport;
+import org.sophie2.base.layout.model.ListPalette;
 import org.sophie2.base.model.book.BookH;
 import org.sophie2.base.model.book.PageH;
+import org.sophie2.base.model.resources.r4.ResourceRefList;
 import org.sophie2.base.model.resources.r4.ResourceRefR4;
+import org.sophie2.base.model.resources.r4.changes.AutoAction;
+import org.sophie2.base.model.resources.r4.resources.ResourceH;
 import org.sophie2.base.visual.BaseVisualElement;
 import org.sophie2.core.mvc.EventFilterBuilder;
 import org.sophie2.core.mvc.LogicR3;
@@ -30 +37 @@
 import org.sophie2.main.app.layout.left.pages.PagePreviewPalette.PageItem;
 import org.sophie2.main.dialogs.input.ConfirmDialogInput;
 import org.sophie2.main.dnd.TemplateRefData;
+import org.sophie2.main.dnd.dnddata.ResourceRefData;
+import org.sophie2.main.dnd.transferables.ResourceTransferable;
 
 /**
  * Event handlers for the {@link PagePreviewPalette}.
@@ -164 +173 @@
                                                 SophieDragDropHandler.TransferEventIds.TRANSACTION_PARAM_INDEX,
                                                 DndPreImport.class);
 
-                                preImport.setImportable(TemplateRefData.class);
+                                preImport.setImportable(ResourceRefData.class, TemplateRefData.class);
+                        }
+                        return true;
+                }
+        },
+        
+        /**
+         * Handles dragging out a page from {@link PagePreviewPalette}.
+         */
+        ON_DND_PAGE_EXPORT {
+
+                public void defineFilter(EventFilterBuilder filter) {
+                        filter.setSourceClass(PagePreviewPalette.class);
+                        filter.setEventId(SophieDragDropHandler.TransferEventIds.DND_EXPORT);
+                }
+
+                public boolean handle(EventR3 event) {
+                        Object firstItem = event.getSource(ListPalette.class).firstSelectedItem().get();
+                        if (firstItem == null || !(firstItem instanceof PageItem)) {
+                                return false;
                         }
+                        ResourceH resource = ((PageItem) firstItem).pageView().get().model().get();
+                        
+                        SophieTransferable rt = new ResourceTransferable(resource);
+
+                        DndExport export = event.getEventParam(
+                                        SophieDragDropHandler.TransferEventIds.TRANSACTION_PARAM_INDEX,
+                                        DndExport.class);
+
+                        export.setTransferable(rt);
+                        
                         return true;
                 }
+                
         },
         
         /**
@@ -254 +293 @@
                         
                         return false;
                 }
+        },
+        
+        /**
+         * Handles dropping a page over the {@link PagePreviewPalette}.
+         * Reorders pages if the transferred object is a page and the page is from the same book.
+         */
+        ON_DND_PAGE_REORDER {
+
+                public void defineFilter(EventFilterBuilder filter) {
+                        filter.setSourceClass(PagePreviewPalette.class);
+                        filter.setEventId(SophieDragDropHandler.TransferEventIds.DND_IMPORT);
+                }
+
+                public boolean handle(final EventR3 event) {
+                        
+                        DndImport dndImport = event.getEventParam(
+                                        SophieDragDropHandler.TransferEventIds.TRANSACTION_PARAM_INDEX,
+                                        DndImport.class);
+                        DndTransferable transferable = dndImport.getTransferable();
+                        ResourceRefData data = transferable.getDndData(ResourceRefData.class);
+                        
+                        if (data == null) {
+                                return false;
+                        }
+                        
+                        ImmPoint point = event.getEventParam(
+                                        SophieDragDropHandler.TransferEventIds.POINT_PARAM_INDEX,
+                                        ImmPoint.class);
+                        
+                        PagePreviewPalette palette = event.getSource(PagePreviewPalette.class);
+                        final int dropIndex = palette.mainComponent().get().locationToIndex(point.toPoint());
+                        
+                        BookH book = AppViewUtil.getCurrentBook(palette);
+                        final int dragIndex = book.getIndexOf(data.getResourceRef());
+                        
+                        if (dragIndex == -1 || dropIndex == -1) {
+                                return false;
+                        }
+                        
+                        final ResourceRefList pages = book.getPages();
+                        
+                        new AutoAction("Reorder Pages.", true) {
+
+                                @Override
+                                public void performAuto() {
+                                        BookH.movePage(getChanger(), pages, dragIndex, dropIndex);
+                                }
+                                
+                        }.register(book.getAccess());
+                        
+                        return true;
+                }
         };
 
         /**

src/main/java/org/sophie2/main/app/layout/left/pages/PagePreviewPalette.java

@@ -261 +261 @@
         @Override
         protected JComponent initHead() {
                 SophieDragDropHandler.registerComponent(mainComponent().get(),
-                                PagePreviewPalette.this, null, null, false, true);
+                                PagePreviewPalette.this, null, null, true, true);
                 
                 JPanel res = new JPanel();
                 res.setLayout(new BoxLayout(res, BoxLayout.X_AXIS));