Skip to content

Commit

Permalink
Remove PDF preview functionality
Browse files Browse the repository at this point in the history
  • Loading branch information
@stefan-kolb
stefan-kolb committed Jan 28, 2016
1 parent 68d8c68 commit a13c6d6
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 230 deletions.
3 changes: 0 additions & 3 deletions src/main/java/net/sf/jabref/JabRefPreferences.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,8 +358,6 @@ public final class JabRefPreferences {
private static final String CUSTOM_TYPE_REQ = "customTypeReq_";
private static final String CUSTOM_TYPE_OPT = "customTypeOpt_";
private static final String CUSTOM_TYPE_PRIOPT = "customTypePriOpt_";
public static final String PDF_PREVIEW = "pdfPreview";


private static final char[][] VALUE_DELIMITERS = new char[][] { {'"', '"'}, {'{', '}'}};

Expand Down Expand Up @@ -476,7 +474,6 @@ private JabRefPreferences() {
defaults.put(PROXY_USERNAME, "");
defaults.put(PROXY_PASSWORD, "");

defaults.put(PDF_PREVIEW, Boolean.FALSE);
defaults.put(USE_DEFAULT_LOOK_AND_FEEL, Boolean.TRUE);
defaults.put(LYXPIPE, USER_HOME + File.separator + ".lyx/lyxpipe");
defaults.put(VIM, "vim");
Expand Down
145 changes: 0 additions & 145 deletions src/main/java/net/sf/jabref/gui/PdfPreviewPanel.java
View file

This file was deleted.

70 changes: 4 additions & 66 deletions src/main/java/net/sf/jabref/gui/PreviewPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ public class PreviewPanel extends JPanel implements VetoableChangeListener, Sear
*/
private String layoutFile;

private final Optional<PdfPreviewPanel> pdfPreviewPanel;
private final Optional<BasePanel> panel;

private JEditorPane previewPane;
Expand Down Expand Up @@ -110,29 +109,8 @@ public class PreviewPanel extends JPanel implements VetoableChangeListener, Sear
* (must be given) Used for layout
*/
public PreviewPanel(BibDatabase database, BibEntry entry,
BasePanel panel, MetaData metaData, String layoutFile) {
this(database, entry, panel, metaData, layoutFile, false);
}


/**
* @param database
* (may be null) Optionally used to resolve strings.
* @param entry
* (may be null) If given this entry is shown otherwise you have
* to call setEntry to make something visible.
* @param panel
* (may be null) If not given no toolbar is shown on the right
* hand side.
* @param metaData
* (must be given) Used for resolving pdf directories for links.
* @param layoutFile
* (must be given) Used for layout
* @param withPDFPreview if true, a PDF preview is included in the PreviewPanel
*/
public PreviewPanel(BibDatabase database, BibEntry entry,
BasePanel panel, MetaData metaData, String layoutFile, boolean withPDFPreview) {
this(panel, metaData, layoutFile, withPDFPreview);
BasePanel panel, MetaData metaData, String layoutFile) {
this(panel, metaData, layoutFile);
this.database = Optional.ofNullable(database);
setEntry(entry);
}
Expand All @@ -148,26 +126,8 @@ public PreviewPanel(BibDatabase database, BibEntry entry,
* (must be given) Used for layout
*/
public PreviewPanel(BasePanel panel, MetaData metaData, String layoutFile) {
this(panel, metaData, layoutFile, false);
}

/**
*
* @param panel
* (may be null) If not given no toolbar is shown on the right
* hand side.
* @param metaData
* (must be given) Used for resolving pdf directories for links.
* @param layoutFile
* (must be given) Used for layout
* @param withPDFPreview if true, a PDF preview is included in the PreviewPanel.
* The user can override this setting by setting the config setting JabRefPreferences.PDF_PREVIEW to false.
*/
private PreviewPanel(BasePanel panel, MetaData metaData, String layoutFile, boolean withPDFPreview) {
super(new BorderLayout(), true);

withPDFPreview = withPDFPreview && JabRefPreferences.getInstance().getBoolean(JabRefPreferences.PDF_PREVIEW);

this.metaData = Objects.requireNonNull(metaData);
this.layoutFile = Objects.requireNonNull(layoutFile);
updateLayout();
Expand All @@ -179,11 +139,7 @@ private PreviewPanel(BasePanel panel, MetaData metaData, String layoutFile, bool
this.panel = Optional.ofNullable(panel);

createPreviewPane();
if (withPDFPreview) {
this.pdfPreviewPanel = Optional.of(new PdfPreviewPanel(metaData));
} else {
this.pdfPreviewPanel = Optional.empty();
}

if (panel != null) {
// dropped files handler only created for main window
// not for Windows as like the search results window
Expand All @@ -205,22 +161,7 @@ private PreviewPanel(BasePanel panel, MetaData metaData, String layoutFile, bool
add(createToolBar(), BorderLayout.LINE_START);
}

if (withPDFPreview) {
JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scrollPane, pdfPreviewPanel.orElse(null));
splitPane.setOneTouchExpandable(true);

int oneThird = 400; // arbitrarily set
splitPane.setDividerLocation(oneThird * 2);

// Provide minimum sizes for the two components in the split pane
// Dimension minimumSize = new Dimension(oneThird * 2, 50);
// scrollPane.setMinimumSize(minimumSize);
// minimumSize = new Dimension(oneThird, 50);
// pdfScrollPane.setMinimumSize(minimumSize);
add(splitPane);
} else {
add(scrollPane, BorderLayout.CENTER);
}
add(scrollPane, BorderLayout.CENTER);
}

private JPopupMenu createPopupMenu() {
Expand Down Expand Up @@ -355,9 +296,6 @@ public void update() {

// Scroll to top:
scrollToTop();

// update pdf preview
pdfPreviewPanel.ifPresent(p -> p.updatePanel(entry.orElse(null)));
}

private void scrollToTop() {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/sf/jabref/gui/maintable/MainTableSelectionListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ public MainTableSelectionListener(BasePanel panel, MainTable table) {
this.tableRows = table.getTableRows();
previewPanel = new PreviewPanel[] {
new PreviewPanel(panel.database(), null, panel, panel.metaData(), Globals.prefs
.get(JabRefPreferences.PREVIEW_0), true),
.get(JabRefPreferences.PREVIEW_0)),
new PreviewPanel(panel.database(), null, panel, panel.metaData(), Globals.prefs
.get(JabRefPreferences.PREVIEW_1), true)};
.get(JabRefPreferences.PREVIEW_1))};

panel.getSearchBar().getSearchQueryHighlightObservable().addSearchListener(previewPanel[0]);
panel.getSearchBar().getSearchQueryHighlightObservable().addSearchListener(previewPanel[1]);
Expand Down
14 changes: 0 additions & 14 deletions src/main/java/net/sf/jabref/gui/preftabs/PreviewPrefsTab.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,6 @@ class PreviewPrefsTab extends JPanel implements PrefsTab {
private final JButton testButton2 = new JButton(Localization.lang("Test"));
private final JButton defaultButton2 = new JButton(Localization.lang("Default"));

private final JPanel pdfPreviewPanel = new JPanel(new BorderLayout());

private final JCheckBox pdfPreview = new JCheckBox(Localization.lang("Enable PDF preview"));
private final JPanel firstPanel = new JPanel();
private final JScrollPane firstScrollPane = new JScrollPane(layout1);

Expand Down Expand Up @@ -139,16 +136,7 @@ public PreviewPrefsTab(JabRefPreferences prefs) {
layoutConstraints.weighty = 1;
layout.setConstraints(secondPanel, layoutConstraints);
add(secondPanel);

// PDF Preview button
pdfPreviewPanel.add(pdfPreview, BorderLayout.WEST);

// Help Button
pdfPreviewPanel.add(help, BorderLayout.EAST);

layoutConstraints.weighty = 0;
layout.setConstraints(pdfPreviewPanel, layoutConstraints);
add(pdfPreviewPanel);

defaultButton.addActionListener(new ActionListener() {

Expand Down Expand Up @@ -263,14 +251,12 @@ private static BibEntry getTestEntry() {
public void setValues() {
layout1.setText(prefs.get(JabRefPreferences.PREVIEW_0).replace("__NEWLINE__", "\n"));
layout2.setText(prefs.get(JabRefPreferences.PREVIEW_1).replace("__NEWLINE__", "\n"));
pdfPreview.setSelected(prefs.getBoolean(JabRefPreferences.PDF_PREVIEW));
}

@Override
public void storeSettings() {
prefs.put(JabRefPreferences.PREVIEW_0, layout1.getText().replace("\n", "__NEWLINE__"));
prefs.put(JabRefPreferences.PREVIEW_1, layout2.getText().replace("\n", "__NEWLINE__"));
prefs.putBoolean(JabRefPreferences.PDF_PREVIEW, pdfPreview.isSelected());
}

@Override
Expand Down

0 comments on commit a13c6d6

Please sign in to comment.