Skip to content
Snippets Groups Projects
Commit cf5526eb authored by aburn's avatar aburn
Browse files

Moved cover editor to annotation panel in MMT

parent 5f1df56d
Branches
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 900 additions and 803 deletions
src/lang-lrb.xml
+ 1
− 0
View file @ cf5526eb
......@@ -35,6 +35,7 @@
<entry key="annotateNoDisplayLabel">Nothing to display</entry>
<entry key="annotateRefreshTooltip">Apply filter</entry>
<entry key="annotateSaveMessage">Some changes to '%key' might not have been saved. Would you like to save them now?</entry>
<entry key="annotateTypeCover">Cover</entry>
<entry key="annotateTypeImage">Image</entry>
<entry key="annotateTypeLabel">Type</entry>
<entry key="annotateTypeText">Text</entry>
......
src/lang-lrb_fr.xml
+ 1
− 0
View file @ cf5526eb
......@@ -35,6 +35,7 @@
<entry key="annotateNoDisplayLabel">Rien à afficher</entry>
<entry key="annotateRefreshTooltip">Appliquer le filtre</entry>
<entry key="annotateSaveMessage">Certains changements apportés à '%key' n'ont peut-être pas été enregistrés. Voulez-vous les enregistrer maintenant?</entry>
<entry key="annotateTypeCover">Couverture</entry>
<entry key="annotateTypeImage">Image</entry>
<entry key="annotateTypeLabel">Type</entry>
<entry key="annotateTypeText">Texte</entry>
......
src/org/interreg/docexplore/authoring/ATManuscriptEditor.java
+ 8
− 2
View file @ cf5526eb
......@@ -62,7 +62,7 @@ public class ATManuscriptEditor extends ManuscriptEditor
public ATManuscriptEditor(final ATAppHost appHost, DocumentEditorHost host, Book book, Object param) throws DataLinkException
{
super(host, book, param);
super(host, book, param, true);
this.appHost = appHost;
......@@ -117,7 +117,13 @@ public class ATManuscriptEditor extends ManuscriptEditor
@Override public void onActionRequest(final String action, final Object param) throws Exception
{
if (action.equals("up"))
return;
return;
else if (action.equals("cover-changed"))
{
// //TODO: useless? handled by cover editor
// if (configurationEditor != null && configurationEditor instanceof BookEditor && ((BookEditor)configurationEditor).cover != null)
// ((BookEditor)configurationEditor).cover.refresh();
}
else if (action.equals(importPagesRequestEvent))
{
GuiUtils.blockUntilComplete(new GuiUtils.ProgressRunnable()
......
src/org/interreg/docexplore/authoring/CollectionExplorerHost.java
+ 69
− 69
View file @ cf5526eb
......@@ -12,72 +12,72 @@ In this respect, the user's attention is drawn to the risks associated with load
The fact that you are presently reading this means that you have had knowledge of the CeCILL license and that you accept its terms.
*/
package org.interreg.docexplore.authoring;
import java.util.Collection;
import org.interreg.docexplore.gui.ErrorHandler;
import org.interreg.docexplore.manuscript.AnnotatedObject;
import org.interreg.docexplore.manuscript.Book;
import org.interreg.docexplore.manuscript.app.ActionRequestListener;
import org.interreg.docexplore.manuscript.app.DocumentPanel;
import org.interreg.docexplore.manuscript.app.DocumentPanelEditor;
import org.interreg.docexplore.manuscript.app.EditorSidePanel;
import org.interreg.docexplore.manuscript.app.ManuscriptAppHost;
import org.interreg.docexplore.manuscript.app.editors.CollectionEditor;
import org.interreg.docexplore.manuscript.app.editors.ManuscriptEditor;
public class CollectionExplorerHost extends ManuscriptAppHost
{
CollectionExplorer app;
public CollectionExplorerHost(CollectionExplorer app, ATAppHost parent)
{
super(null, null);
this.helpPanel = parent.helpPanel;
this.app = app;
}
@Override public ActionRequestListener getActionRequestListener() {return null;}
@Override public DocumentPanel getActiveDocument() {return app.document;}
@Override public void setActiveDocument(AnnotatedObject document) {}
@Override public DocumentPanel getDocument(AnnotatedObject document)
{
if (app.isCurrentDocument(document))
return app.document;
return null;
}
@Override public void getDocuments(Collection<DocumentPanel> documents) {documents.add(app.document);}
@Override public DocumentPanel addDocument(AnnotatedObject document, Object param)
{
DocumentPanel panel = app.setPanel(document, param);
notifyActiveDocumentChanged();
return panel;
}
@Override public void removeDocument(AnnotatedObject document) {if (app.isCurrentDocument(document)) app.removePanel();}
@SuppressWarnings("serial")
@Override public DocumentPanelEditor getEditorForDocument(DocumentPanel panel, AnnotatedObject document, Object param)
{
try
{
if (document == null) return new CollectionEditor(panel);
if (document instanceof Book) return new ManuscriptEditor(panel, (Book)document, param) {
{
topPanel.titlePanel.add(new ExplorerToolBar(CollectionExplorerHost.this, true));
configurationEditor.setReadOnly(true);
canOpenPages = false;
}};
}
catch (Exception e) {ErrorHandler.defaultHandler.submit(e);}
return null;
}
@Override public EditorSidePanel buildSidePanelForEditor(DocumentPanelEditor editor) {return null;}
@Override public void setMessage(String s) {}
@Override public void refreshTabNames() {}
}
package org.interreg.docexplore.authoring;
import java.util.Collection;
import org.interreg.docexplore.gui.ErrorHandler;
import org.interreg.docexplore.manuscript.AnnotatedObject;
import org.interreg.docexplore.manuscript.Book;
import org.interreg.docexplore.manuscript.app.ActionRequestListener;
import org.interreg.docexplore.manuscript.app.DocumentPanel;
import org.interreg.docexplore.manuscript.app.DocumentPanelEditor;
import org.interreg.docexplore.manuscript.app.EditorSidePanel;
import org.interreg.docexplore.manuscript.app.ManuscriptAppHost;
import org.interreg.docexplore.manuscript.app.editors.CollectionEditor;
import org.interreg.docexplore.manuscript.app.editors.ManuscriptEditor;
public class CollectionExplorerHost extends ManuscriptAppHost
{
CollectionExplorer app;
public CollectionExplorerHost(CollectionExplorer app, ATAppHost parent)
{
super(null, null);
this.helpPanel = parent.helpPanel;
this.app = app;
}
@Override public ActionRequestListener getActionRequestListener() {return null;}
@Override public DocumentPanel getActiveDocument() {return app.document;}
@Override public void setActiveDocument(AnnotatedObject document) {}
@Override public DocumentPanel getDocument(AnnotatedObject document)
{
if (app.isCurrentDocument(document))
return app.document;
return null;
}
@Override public void getDocuments(Collection<DocumentPanel> documents) {documents.add(app.document);}
@Override public DocumentPanel addDocument(AnnotatedObject document, Object param)
{
DocumentPanel panel = app.setPanel(document, param);
notifyActiveDocumentChanged();
return panel;
}
@Override public void removeDocument(AnnotatedObject document) {if (app.isCurrentDocument(document)) app.removePanel();}
@SuppressWarnings("serial")
@Override public DocumentPanelEditor getEditorForDocument(DocumentPanel panel, AnnotatedObject document, Object param)
{
try
{
if (document == null) return new CollectionEditor(panel);
if (document instanceof Book) return new ManuscriptEditor(panel, (Book)document, param, true) {
{
topPanel.titlePanel.add(new ExplorerToolBar(CollectionExplorerHost.this, true));
configurationEditor.setReadOnly(true);
canOpenPages = false;
}};
}
catch (Exception e) {ErrorHandler.defaultHandler.submit(e);}
return null;
}
@Override public EditorSidePanel buildSidePanelForEditor(DocumentPanelEditor editor) {return null;}
@Override public void setMessage(String s) {}
@Override public void refreshTabNames() {}
}
src/org/interreg/docexplore/gui/icons/cover-32x32.png 0 → 100644
+ 0
− 0
View file @ cf5526eb
src/org/interreg/docexplore/gui/icons/cover-32x32.png

891 B

src/org/interreg/docexplore/gui/icons/cover-64x64.png 0 → 100644
+ 0
− 0
View file @ cf5526eb
src/org/interreg/docexplore/gui/icons/cover-64x64.png

1.65 KiB

src/org/interreg/docexplore/management/annotate/MMTAnnotationPanel.java
+ 116
− 114
View file @ cf5526eb
......@@ -12,8 +12,8 @@ In this respect, the user's attention is drawn to the risks associated with load
The fact that you are presently reading this means that you have had knowledge of the CeCILL license and that you accept its terms.
*/
package org.interreg.docexplore.management.annotate;
package org.interreg.docexplore.management.annotate;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
......@@ -38,47 +38,49 @@ import org.interreg.docexplore.manuscript.app.EditorSidePanel;
import org.interreg.docexplore.manuscript.app.ManuscriptAppHost;
import org.interreg.docexplore.manuscript.app.editors.EditorHeader;
import org.interreg.docexplore.manuscript.app.editors.GuiConstants;
import org.interreg.docexplore.util.ImageUtils;
@SuppressWarnings("serial")
public class MMTAnnotationPanel extends JPanel implements EditorSidePanel
import org.interreg.docexplore.util.ImageUtils;
@SuppressWarnings("serial")
public class MMTAnnotationPanel extends JPanel implements EditorSidePanel
{
ManuscriptAppHost win;
AnnotationHandler handler;
AnnotatedObject document;
ExpandingItemList annotationList;
JScrollPane scrollPane;
ListFilter filter;
AnnotationHandler handler;
AnnotatedObject document;
ExpandingItemList annotationList;
JScrollPane scrollPane;
ListFilter filter;
IconButton copy, paste;
EditorHeader header;
public MMTAnnotationPanel(final ManuscriptAppHost win)
{
EditorHeader header;
public MMTAnnotationPanel(final ManuscriptAppHost win)
{
super(new BorderLayout());
this.win = win;
add(this.header = new EditorHeader(), BorderLayout.NORTH);
header.setTitle(Lang.s("transcriptAvailableLabel"), "");
header.setTitleIcon(ImageUtils.getIcon("free-64x64.png"));
final DocExploreDataLink link = win.getLink();
final JPanel mainPanel = new JPanel(new BorderLayout());
this.handler = new AnnotationHandler(win, win.plugins);
this.annotationList = new ExpandingItemList();
this.filter = new ListFilter(link);
filter.addListener(new ListFilter.Listener() {@Override public void filterChanged(ListFilter filter)
{
try {setDocument(document);}
catch (Exception e) {ErrorHandler.defaultHandler.submit(e);}
validate();
repaint();
}});
final DocExploreDataLink link = win.getLink();
final JPanel mainPanel = new JPanel(new BorderLayout());
this.handler = new AnnotationHandler(win, win.plugins);
this.annotationList = new ExpandingItemList();
this.filter = new ListFilter(link);
filter.addListener(new ListFilter.Listener() {@Override public void filterChanged(ListFilter filter)
{
try {setDocument(document);}
catch (Exception e) {ErrorHandler.defaultHandler.submit(e);}
validate();
repaint();
}});
this.scrollPane = new JScrollPane(annotationList);
annotationList.setBackground(Color.white);
JPanel listPanel = new JPanel(new BorderLayout());
listPanel.add(scrollPane, BorderLayout.CENTER);
annotationList.setBackground(Color.white);
JPanel listPanel = new JPanel(new BorderLayout());
listPanel.add(scrollPane, BorderLayout.CENTER);
header.titlePanel.add(win.helpPanel.createHelpMessageButton(Lang.s("helpMmtAnnotationsMsg")));
header.titlePanel.add(win.helpPanel.createHelpMessageButton(Lang.s("helpMmtAnnotationsMsg")));
header.titlePanel.add(new IconButton("add-24x24.png", Lang.s("annotateAddTooltip"),
new ActionListener() {public void actionPerformed(ActionEvent e) {addAnnotation();}}));
header.titlePanel.add(copy = new IconButton("copy-24x24.png", Lang.s("generalMenuEditCopy"),
......@@ -89,91 +91,91 @@ public class MMTAnnotationPanel extends JPanel implements EditorSidePanel
try {win.clipboard.paste(document); setDocument(document); MMTAnnotationPanel.this.validate(); MMTAnnotationPanel.this.repaint();}
catch (Exception ex) {ErrorHandler.defaultHandler.submit(ex);}
}}));
paste.setEnabled(win.clipboard.hasCopiedId());
// final IconToggleButton filterButton = new IconToggleButton("gears-24x24.png", XMLResourceBundle.getBundledString("annotateFilterTooltip"));
// filterButton.addActionListener(new ActionListener() {public void actionPerformed(ActionEvent e)
// {
// if (filterButton.isSelected())
// {
// filter.refreshKeys(link);
// mainPanel.add(filter, BorderLayout.SOUTH);
// }
// else mainPanel.remove(filter);
// mainPanel.validate();
// }});
// listButPanel.add(filterButton);
mainPanel.add(listPanel, BorderLayout.CENTER);
add(new JScrollPane(mainPanel), BorderLayout.CENTER);
}
paste.setEnabled(win.clipboard.hasCopiedId());
// final IconToggleButton filterButton = new IconToggleButton("gears-24x24.png", XMLResourceBundle.getBundledString("annotateFilterTooltip"));
// filterButton.addActionListener(new ActionListener() {public void actionPerformed(ActionEvent e)
// {
// if (filterButton.isSelected())
// {
// filter.refreshKeys(link);
// mainPanel.add(filter, BorderLayout.SOUTH);
// }
// else mainPanel.remove(filter);
// mainPanel.validate();
// }});
// listButPanel.add(filterButton);
mainPanel.add(listPanel, BorderLayout.CENTER);
add(new JScrollPane(mainPanel), BorderLayout.CENTER);
}
@Override public void onShow() {}
@Override public void onHide()
{
annotationList.contractAll();
}
void removeAnnotation(AnnotationEditor editor)
{
try {handler.deleteMetaData(document, editor.annotation);}
catch (Exception ex) {ErrorHandler.defaultHandler.submit(ex);}
}
public MetaData addAnnotation()
{
try
{
MetaData object = handler.createMetaData(document);
if (object == null)
return null;
AnnotationEditor editor = getEditorFor(object);
if (editor == null)
return null;
annotationList.contractAll();
@Override public void onShow() {}
@Override public void onHide()
{
annotationList.contractAll();
}
void removeAnnotation(AnnotationEditor editor)
{
try {handler.deleteMetaData(document, editor.annotation);}
catch (Exception ex) {ErrorHandler.defaultHandler.submit(ex);}
}
public MetaData addAnnotation()
{
try
{
MetaData object = handler.createMetaData(document);
if (object == null)
return null;
AnnotationEditor editor = getEditorFor(object);
if (editor == null)
return null;
annotationList.contractAll();
editor.expand();
return object;
}
return object;
}
catch (Exception ex) {ErrorHandler.defaultHandler.submit(ex);}
return null;
}
public void setDocument(AnnotatedObject document) throws DataLinkException
{
this.document = document;
annotationList.removeAll();
for (Map.Entry<MetaDataKey, List<MetaData>> entry : document.getMetaData().entrySet())
for (MetaData annotation : entry.getValue())
if (!handler.win.getLink().hiddenKeys.contains(annotation.getKey()) && annotation.getKey() != handler.win.getLink().tagKey && filter.matches(annotation))
addObject(annotation);
annotationList.validate();
annotationList.repaint();
}
Color odd = Color.lightGray, even = Color.gray;
Color oddDark = new Color(.75f, .45f, .45f), evenDark = new Color(.45f, .45f, .75f);
/**
* Adds a meta data object to the list.
* @param object A meta data object.
*/
public AnnotationEditor addObject(MetaData object) throws DataLinkException
{
AnnotationEditor editor = handler.getEditorFor(this, object);
if (editor == null)
return null;
editor.setOpaque(true);
return null;
}
public void setDocument(AnnotatedObject document) throws DataLinkException
{
this.document = document;
annotationList.removeAll();
for (Map.Entry<MetaDataKey, List<MetaData>> entry : document.getMetaData().entrySet())
for (MetaData annotation : entry.getValue())
if (!handler.win.getLink().hiddenKeys.contains(annotation.getKey()) && annotation.getKey() != handler.win.getLink().tagKey && filter.matches(annotation))
addObject(annotation);
annotationList.validate();
annotationList.repaint();
}
Color odd = Color.lightGray, even = Color.gray;
Color oddDark = new Color(.75f, .45f, .45f), evenDark = new Color(.45f, .45f, .75f);
/**
* Adds a meta data object to the list.
* @param object A meta data object.
*/
public AnnotationEditor addObject(MetaData object) throws DataLinkException
{
AnnotationEditor editor = handler.getEditorFor(this, object);
if (editor == null)
return null;
editor.setOpaque(true);
editor.setBackground(annotationList.getComponentCount()%2 == 0 ? GuiConstants.listOddColor : GuiConstants.listEvenColor);
//editor.setBackground(Color.white);
//editor.setBackground(Color.white);
//editor.setBorder(BorderFactory.createLineBorder(annotationList.getComponentCount()%2 == 0 ? oddDark : evenDark, 2));
//editor.setBorder(BorderFactory.createLineBorder(Color.LIGHT_GRAY, 1));
annotationList.addItem(editor);
return editor;
}
public AnnotationEditor getEditorFor(MetaData object)
{
for (Component comp : annotationList.getComponents())
if (comp instanceof AnnotationEditor && ((AnnotationEditor)comp).annotation == object)
return (AnnotationEditor)comp;
return null;
//editor.setBorder(BorderFactory.createLineBorder(Color.LIGHT_GRAY, 1));
annotationList.addItem(editor);
return editor;
}
public AnnotationEditor getEditorFor(MetaData object)
{
for (Component comp : annotationList.getComponents())
if (comp instanceof AnnotationEditor && ((AnnotationEditor)comp).annotation == object)
return (AnnotationEditor)comp;
return null;
}
@Override public Component getComponent() {return this;}
}
@Override public Component getComponent() {return this;}
}
src/org/interreg/docexplore/management/annotate/MMTCoverEditor.java 0 → 100644
+ 51
− 0
View file @ cf5526eb
package org.interreg.docexplore.management.annotate;
import java.awt.BorderLayout;
import java.awt.FlowLayout;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
import org.interreg.docexplore.datalink.DataLinkException;
import org.interreg.docexplore.internationalization.Lang;
import org.interreg.docexplore.manuscript.Book;
import org.interreg.docexplore.manuscript.MetaData;
import org.interreg.docexplore.manuscript.app.editors.BookCoverEditor;
import org.interreg.docexplore.util.ImageUtils;
@SuppressWarnings("serial")
public class MMTCoverEditor extends AnnotationEditor
{
BookCoverEditor covers;
public MMTCoverEditor(MMTAnnotationPanel panel, MetaData annotation) throws DataLinkException
{
super(panel, annotation);
this.covers = new BookCoverEditor((Book)panel.document, panel.win, 128);
keyLabel.setIcon(ImageUtils.getIcon("cover-64x64.png"));
}
@Override protected void fillExpandedState()
{
super.fillExpandedState();
JPanel content = new JPanel(new FlowLayout());
content.setOpaque(false);
content.add(covers);
content.add(panel.win.helpPanel.createHelpMessageButton(Lang.s("helpCover")));
add(content, BorderLayout.CENTER);
add(new JLabel("<html><big>"+Lang.s("annotateTypeCover")+"</big></html>",
ImageUtils.getIcon("cover-64x64.png"),
SwingConstants.LEFT), BorderLayout.NORTH);
covers.refresh();
}
@Override public void writeObject(MetaData object) throws DataLinkException
{
}
}
src/org/interreg/docexplore/management/gui/MMTManuscriptEditor.java
+ 1
− 1
View file @ cf5526eb
......@@ -40,7 +40,7 @@ public class MMTManuscriptEditor extends ManuscriptEditor
public MMTManuscriptEditor(DocumentEditorHost host, Book book, Object param) throws DataLinkException
{
super(host, book, param);
super(host, book, param, false);
isLocked = false;
......
src/org/interreg/docexplore/manuscript/MetaDataUtils.java
+ 8
− 2
View file @ cf5526eb
......@@ -19,8 +19,9 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.io.ObjectOutputStream;
import java.util.List;
import java.util.List;
import org.interreg.docexplore.datalink.DataLinkException;
import org.interreg.docexplore.util.ImageUtils;
public class MetaDataUtils
......@@ -56,5 +57,10 @@ public class MetaDataUtils
out.close();
MetaData res = new MetaData(link, key, MetaData.textType, new ByteArrayInputStream(out.toByteArray()));
return res;
}
public static boolean hasCover(AnnotatedObject object) throws DataLinkException
{
return !object.getMetaDataListForKey(object.getLink().getOrCreateKey("cover")).isEmpty();
}
}
src/org/interreg/docexplore/manuscript/app/editors/BookCoverEditor.java
+ 21
− 18
View file @ cf5526eb
......@@ -14,24 +14,23 @@ The fact that you are presently reading this means that you have had knowledge o
*/
package org.interreg.docexplore.manuscript.app.editors;
import java.util.List;
import javax.swing.ImageIcon;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
import org.interreg.docexplore.gui.ErrorHandler;
import org.interreg.docexplore.gui.LooseGridLayout;
import java.util.List;
import javax.swing.ImageIcon;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
import org.interreg.docexplore.gui.ErrorHandler;
import org.interreg.docexplore.gui.LooseGridLayout;
import org.interreg.docexplore.internationalization.Lang;
import org.interreg.docexplore.manuscript.Book;
import org.interreg.docexplore.manuscript.CoverUtils.Part;
import org.interreg.docexplore.manuscript.DocExploreDataLink;
import org.interreg.docexplore.manuscript.MetaData;
import org.interreg.docexplore.manuscript.actions.ActionProvider;
import org.interreg.docexplore.manuscript.actions.AddMetaDataAction;
import org.interreg.docexplore.manuscript.actions.DeleteMetaDataAction;
import org.interreg.docexplore.manuscript.app.DocumentEvents;
import org.interreg.docexplore.manuscript.CoverUtils.Part;
import org.interreg.docexplore.manuscript.DocExploreDataLink;
import org.interreg.docexplore.manuscript.MetaData;
import org.interreg.docexplore.manuscript.actions.ActionProvider;
import org.interreg.docexplore.manuscript.actions.AddMetaDataAction;
import org.interreg.docexplore.manuscript.actions.DeleteMetaDataAction;
import org.interreg.docexplore.manuscript.app.ManuscriptAppHost;
import org.interreg.docexplore.util.history.ReversibleAction;
......@@ -99,13 +98,17 @@ public class BookCoverEditor extends JPanel
{
if (delete != null) delete.doAction();
if (add != null) add.doAction();
DocumentEvents.broadcastChanged(host, book);
//DocumentEvents.broadcastChanged(host, book);
host.broadcastAction("cover-changed");
refresh();
}
@Override public void undoAction() throws Exception
{
if (add != null) add.undoAction();
if (delete != null) delete.undoAction();
DocumentEvents.broadcastChanged(host, book);
//DocumentEvents.broadcastChanged(host, book);
host.broadcastAction("cover-changed");
refresh();
}
@Override public String description() {return part != null ? Lang.s("addCover") : Lang.s("deleteCover");}
});
......
src/org/interreg/docexplore/manuscript/app/editors/BookEditor.java
+ 18
− 12
View file @ cf5526eb
......@@ -39,20 +39,24 @@ public class BookEditor extends JPanel implements ConfigurationEditor
public final ManuscriptEditor docEditor;
private boolean readOnly = false;
BookPagesEditor pages;
BookCoverEditor cover;
public final BookCoverEditor cover;
public BookEditor(ManuscriptEditor bookEditor)
public BookEditor(ManuscriptEditor bookEditor, boolean showCover)
{
super(new BorderLayout());
this.docEditor = bookEditor;
add(this.pages = new BookPagesEditor(this), BorderLayout.CENTER);
JPanel coverPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
coverPanel.setOpaque(false);
coverPanel.add(new JLabel("<html><b>"+Lang.s("cover")+"</b></html>"));
coverPanel.add(docEditor.host.getAppHost().helpPanel.createHelpMessageButton(Lang.s("helpCover")));
coverPanel.add(this.cover = new BookCoverEditor(bookEditor.book, bookEditor.host.getAppHost(), 128));
add(coverPanel, BorderLayout.NORTH);
this.cover = showCover ? new BookCoverEditor(bookEditor.book, bookEditor.host.getAppHost(), 128) : null;
if (cover != null)
{
JPanel coverPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
coverPanel.setOpaque(false);
coverPanel.add(new JLabel("<html><b>"+Lang.s("cover")+"</b></html>"));
coverPanel.add(docEditor.host.getAppHost().helpPanel.createHelpMessageButton(Lang.s("helpCover")));
coverPanel.add(cover);
add(coverPanel, BorderLayout.NORTH);
}
setBackground(Color.white);
setReadOnly(readOnly);
......@@ -87,8 +91,9 @@ public class BookEditor extends JPanel implements ConfigurationEditor
@Override public void setReadOnly(boolean b)
{
this.readOnly = b;
pages.setReadOnly(b);
cover.setReadOnly(b);
pages.setReadOnly(b);
if (cover != null)
cover.setReadOnly(b);
}
@SuppressWarnings({ "rawtypes", "unchecked" })
......@@ -132,8 +137,9 @@ public class BookEditor extends JPanel implements ConfigurationEditor
@Override public void refresh()
{
pages.refresh();
cover.refresh();
pages.refresh();
if (cover != null)
cover.refresh();
}
@Override public boolean allowGoto() {return true;}
......
src/org/interreg/docexplore/manuscript/app/editors/ManuscriptEditor.java
+ 2
− 2
View file @ cf5526eb
......@@ -68,7 +68,7 @@ public class ManuscriptEditor extends JPanel implements DocumentPanelEditor, Fra
public final EditorHeader topPanel;
private boolean sidePanel = true;
public ManuscriptEditor(final DocumentEditorHost host, final Book book, Object param) throws DataLinkException
public ManuscriptEditor(final DocumentEditorHost host, final Book book, Object param, boolean showCover) throws DataLinkException
{
super(new BorderLayout());
......@@ -105,7 +105,7 @@ public class ManuscriptEditor extends JPanel implements DocumentPanelEditor, Fra
else if (!PosterUtils.isUpToDate(book)) this.configurationEditor = new PosterPartsEditor(host, book);
else this.configurationEditor = new PosterFinalEditor(this, book);
}
else this.configurationEditor = new BookEditor(this);
else this.configurationEditor = new BookEditor(this, showCover);
add(configurationEditor.getComponent(), BorderLayout.CENTER);
getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), "DEL");
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment