projects
/
gpl
/
argeo-suite.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Style setter for DocBook.
[gpl/argeo-suite.git]
/
publishing
/
org.argeo.publishing.ui
/
src
/
org
/
argeo
/
docbook
/
ui
/
AbstractDbkViewer.java
diff --git
a/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java
b/publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java
index 245c15e54d25887b977fbad8665fb96b1f2e47ae..1b8a237cfcadc14c1642d84cb6661a4e132c5f72 100644
(file)
--- a/
publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java
+++ b/
publishing/org.argeo.publishing.ui/src/org/argeo/docbook/ui/AbstractDbkViewer.java
@@
-4,6
+4,7
@@
import static org.argeo.cms.ui.util.CmsUiUtils.fillWidth;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.Observer;
import java.util.Map;
import java.util.Observer;
@@
-75,7
+76,7
@@
public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke
if (getCmsEditable().canEdit()) {
fileUploadListener = new FUL();
if (getCmsEditable().canEdit()) {
fileUploadListener = new FUL();
- styledTools = new DbkContextMenu(this, parent.get
Display
());
+ styledTools = new DbkContextMenu(this, parent.get
Shell
());
}
this.mainSection = parent;
initModelIfNeeded(mainSection.getNode());
}
this.mainSection = parent;
initModelIfNeeded(mainSection.getNode());
@@
-332,10
+333,15
@@
public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke
void setParagraphStyle(Paragraph paragraph, String style) {
try {
Node paragraphNode = paragraph.getNode();
void setParagraphStyle(Paragraph paragraph, String style) {
try {
Node paragraphNode = paragraph.getNode();
- paragraphNode.setProperty(DocBookNames.DBK_ROLE, style);
+ if (style == null) {// default
+ if (paragraphNode.hasProperty(DocBookNames.DBK_ROLE))
+ paragraphNode.getProperty(DocBookNames.DBK_ROLE).remove();
+ } else {
+ paragraphNode.setProperty(DocBookNames.DBK_ROLE, style);
+ }
persistChanges(paragraphNode);
updateContent(paragraph);
persistChanges(paragraphNode);
updateContent(paragraph);
- layout
(paragraph
);
+ layout
Page(
);
} catch (RepositoryException e1) {
throw new JcrException("Cannot set style " + style + " on " + paragraph, e1);
}
} catch (RepositoryException e1) {
throw new JcrException("Cannot set style " + style + " on " + paragraph, e1);
}
@@
-818,8
+824,10
@@
public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke
edit(composite, source.toDisplay(point));
} else if (e.button == 3) {
EditablePart composite = findDataParent((Control) e.getSource());
edit(composite, source.toDisplay(point));
} else if (e.button == 3) {
EditablePart composite = findDataParent((Control) e.getSource());
- if (styledTools != null)
- styledTools.show(composite, new Point(e.x, e.y));
+ if (styledTools != null) {
+ List<String> styles = getAvailableStyles(composite);
+ styledTools.show(composite, new Point(e.x, e.y), styles);
+ }
}
}
}
}
}
}
@@
-829,6
+837,10
@@
public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke
}
}
}
}
+ protected List<String> getAvailableStyles(EditablePart editablePart) {
+ return new ArrayList<>();
+ }
+
// FILE UPLOAD LISTENER
private class FUL implements FileUploadListener {
public void uploadProgress(FileUploadEvent event) {
// FILE UPLOAD LISTENER
private class FUL implements FileUploadListener {
public void uploadProgress(FileUploadEvent event) {