projects
/
gpl
/
argeo-suite.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into v2.x
[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 814cfb3415e129dcdc28164e27ad72f03d7f78ed..044b675d3f0e530cd98cc4c73e9a7e36c0121e9d 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
@@
-75,6
+75,7
@@
public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke
private boolean showMainTitle = true;
private Integer maxMediaWidth = null;
private boolean showMainTitle = true;
private Integer maxMediaWidth = null;
+ private String defaultSectionStyle;
protected AbstractDbkViewer(Section parent, int style, CmsEditable cmsEditable) {
super(parent, style, cmsEditable);
protected AbstractDbkViewer(Section parent, int style, CmsEditable cmsEditable) {
super(parent, style, cmsEditable);
@@
-106,6
+107,11
@@
public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke
CmsUiUtils.clear(section);
Node node = section.getNode();
TextSection textSection = (TextSection) section;
CmsUiUtils.clear(section);
Node node = section.getNode();
TextSection textSection = (TextSection) section;
+ String style = node.hasProperty(DbkAttr.role.name()) ? node.getProperty(DbkAttr.role.name()).getString()
+ : getDefaultSectionStyle();
+ if (style != null)
+ CmsUiUtils.style(textSection, style);
+
if (node.hasNode(DbkType.title.get())) {
boolean showTitle = getMainSection() == section ? showMainTitle : true;
if (showTitle) {
if (node.hasNode(DbkType.title.get())) {
boolean showTitle = getMainSection() == section ? showMainTitle : true;
if (showTitle) {
@@
-143,7
+149,7
@@
public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke
for (NodeIterator ni = section.getNode().getNodes(DbkType.section.get()); ni.hasNext();) {
Node child = ni.nextNode();
if (isDbk(child, DbkType.section)) {
for (NodeIterator ni = section.getNode().getNodes(DbkType.section.get()); ni.hasNext();) {
Node child = ni.nextNode();
if (isDbk(child, DbkType.section)) {
- TextSection newSection = new
TextSection(section, SWT.NONE
, child);
+ TextSection newSection = new
TextSection(section
, child);
newSection.setLayoutData(CmsUiUtils.fillWidth());
refresh(newSection);
}
newSection.setLayoutData(CmsUiUtils.fillWidth());
refresh(newSection);
}
@@
-155,6
+161,11
@@
public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke
// section.layout(true, true);
}
// section.layout(true, true);
}
+ /** To be overridden in order to provide additional SectionPart types */
+ protected TextSection newTextSection(Section section, Node node) {
+ return new TextSection(section, SWT.NONE, node);
+ }
+
/** To be overridden in order to provide additional SectionPart types */
protected SectionPart newSectionPart(TextSection textSection, Node node) {
return null;
/** To be overridden in order to provide additional SectionPart types */
protected SectionPart newSectionPart(TextSection textSection, Node node) {
return null;
@@
-946,6
+957,14
@@
public abstract class AbstractDbkViewer extends AbstractPageViewer implements Ke
this.showMainTitle = showMainTitle;
}
this.showMainTitle = showMainTitle;
}
+ public String getDefaultSectionStyle() {
+ return defaultSectionStyle;
+ }
+
+ public void setDefaultSectionStyle(String defaultSectionStyle) {
+ this.defaultSectionStyle = defaultSectionStyle;
+ }
+
// 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) {