X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=publishing%2Forg.argeo.publishing.ui%2Fsrc%2Forg%2Fargeo%2Fdocbook%2Fui%2FDbkContextMenu.java;h=a07a1cb5089a0ac4b6a9cde58bfade6d6228c7df;hb=cc5f3a7a328e0487d0b06dd4e99b232a2e551461;hp=ef2695a778831db7518994d820472bd3fa286bd0;hpb=62fe0d412eea802492a6d2a3fee8384ec1d685ae;p=gpl%2Fargeo-suite.git diff --git a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkContextMenu.java b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkContextMenu.java index ef2695a..a07a1cb 100644 --- a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkContextMenu.java +++ b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/DbkContextMenu.java @@ -5,8 +5,6 @@ import java.util.List; import javax.jcr.Node; -import org.argeo.cms.text.Paragraph; -import org.argeo.cms.text.TextSection; import org.argeo.cms.ui.CmsEditable; import org.argeo.cms.ui.util.CmsUiUtils; import org.argeo.cms.ui.viewers.EditablePart; @@ -60,12 +58,13 @@ class DbkContextMenu { if (editablePart instanceof Paragraph) { Paragraph paragraph = (Paragraph) editablePart; deletePartB(parent, DbkMsg.deleteParagraph.lead(), paragraph); - insertMediaB(parent, DbkMsg.insertMedia.lead(), paragraph); + insertMediaB(parent, paragraph); } else if (editablePart instanceof Img) { Img img = (Img) editablePart; deletePartB(parent, DbkMsg.deleteMedia.lead(), img); - insertMediaB(parent, DbkMsg.insertMedia.lead(), img); + insertMediaB(parent, img); + insertParagraphB(parent, DbkMsg.insertParagraph.lead(), img); } else if (editablePart instanceof DocBookSectionTitle) { DocBookSectionTitle sectionTitle = (DocBookSectionTitle) editablePart; @@ -78,7 +77,7 @@ class DbkContextMenu { hide(); }); } - insertMediaB(parent, DbkMsg.insertMedia.lead(), sectionTitle.getSection(), sectionTitle); + insertMediaB(parent, sectionTitle.getSection(), sectionTitle); } StyledToolMouseListener stml = new StyledToolMouseListener(editablePart); @@ -129,22 +128,39 @@ class DbkContextMenu { shell.setVisible(false); } - protected void insertMediaB(Composite parent, String msg, SectionPart sectionPart) { - insertMediaB(parent, msg, sectionPart.getSection(), sectionPart); + protected void insertMediaB(Composite parent, SectionPart sectionPart) { + insertMediaB(parent, sectionPart.getSection(), sectionPart); } - protected void insertMediaB(Composite parent, String msg, Section section, NodePart nodePart) { - Label insertMediaB = new Label(parent, SWT.NONE); - insertMediaB.setText(DbkMsg.insertMedia.lead()); - insertMediaB.addMouseListener((MouseDown) (e) -> { + protected void insertMediaB(Composite parent, Section section, NodePart nodePart) { + Label insertPictureB = new Label(parent, SWT.NONE); + insertPictureB.setText(DbkMsg.insertPicture.lead()); + insertPictureB.addMouseListener((MouseDown) (e) -> { Node newNode = DbkUtils.insertImageAfter(nodePart.getNode()); Jcr.save(newNode); textViewer.insertPart(section, newNode); hide(); }); + Label insertVideoB = new Label(parent, SWT.NONE); + insertVideoB.setText(DbkMsg.insertVideo.lead()); + insertVideoB.addMouseListener((MouseDown) (e) -> { + Node newNode = DbkUtils.insertVideoAfter(nodePart.getNode()); + Jcr.save(newNode); + textViewer.insertPart(section, newNode); + hide(); + }); } + protected void insertParagraphB(Composite parent, String msg, SectionPart sectionPart) { + Label insertMediaB = new Label(parent, SWT.NONE); + insertMediaB.setText(msg); + insertMediaB.addMouseListener((MouseDown) (e) -> { + textViewer.addParagraph(sectionPart, null); + hide(); + }); + } + protected void deletePartB(Composite parent, String msg, SectionPart sectionPart) { Label deleteB = new Label(shell, SWT.NONE); deleteB.setText(msg);