Skip to content

Commit

Permalink
Use special button layout for toolbar button in OSX
Browse files Browse the repository at this point in the history
  • Loading branch information
@simonharrer
simonharrer committed Jan 26, 2016
1 parent d9b7f64 commit 2a3b454
Show file tree
Hide file tree
Showing 3 changed files with 78 additions and 83 deletions.
136 changes: 58 additions & 78 deletions src/main/java/net/sf/jabref/gui/JabRefFrame.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,90 +15,76 @@
*/
package net.sf.jabref.gui;

import java.awt.Component;
import java.awt.Cursor;
import java.awt.Font;
import java.awt.Frame;
import java.awt.GraphicsEnvironment;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.awt.Window;
import java.awt.event.ActionEvent;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import java.awt.event.KeyAdapter;
import java.awt.event.MouseAdapter;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
import java.util.*;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;

import com.jgoodies.looks.HeaderStyle;
import com.jgoodies.looks.Options;
import net.sf.jabref.*;
import net.sf.jabref.bibtex.EntryTypes;
import net.sf.jabref.exporter.*;
import net.sf.jabref.external.ExternalFileTypeEditor;
import net.sf.jabref.external.push.PushToApplicationButton;
import net.sf.jabref.external.push.PushToApplications;
import net.sf.jabref.groups.EntryTableTransferHandler;
import net.sf.jabref.groups.GroupSelector;
import net.sf.jabref.gui.actions.*;
import net.sf.jabref.gui.desktop.JabRefDesktop;
import net.sf.jabref.gui.help.HelpAction;
import net.sf.jabref.gui.help.HelpDialog;
import net.sf.jabref.gui.journals.ManageJournalsAction;
import net.sf.jabref.gui.keyboard.KeyBinding;
import net.sf.jabref.gui.keyboard.KeyBindingRepository;
import net.sf.jabref.gui.keyboard.KeyBindingsDialog;
import net.sf.jabref.gui.menus.ChangeEntryTypeMenu;
import net.sf.jabref.gui.menus.help.DonateAction;
import net.sf.jabref.gui.worker.AbstractWorker;
import net.sf.jabref.gui.worker.MarkEntriesAction;
import net.sf.jabref.gui.menus.help.ForkMeOnGitHubAction;
import net.sf.jabref.gui.preftabs.PreferencesDialog;
import net.sf.jabref.gui.util.FocusRequester;
import net.sf.jabref.gui.util.PositionWindow;
import net.sf.jabref.gui.worker.AbstractWorker;
import net.sf.jabref.gui.worker.MarkEntriesAction;
import net.sf.jabref.importer.*;
import net.sf.jabref.importer.fetcher.GeneralFetcher;
import net.sf.jabref.logic.logging.GuiAppender;
import net.sf.jabref.logic.CustomEntryTypesManager;
import net.sf.jabref.logic.integrity.IntegrityCheck;
import net.sf.jabref.logic.integrity.IntegrityMessage;
import net.sf.jabref.logic.l10n.Localization;
import net.sf.jabref.logic.logging.GuiAppender;
import net.sf.jabref.logic.preferences.LastFocusedTabPreferences;
import net.sf.jabref.logic.util.OS;
import net.sf.jabref.logic.util.io.FileUtil;
import net.sf.jabref.model.database.BibDatabase;
import net.sf.jabref.model.entry.*;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

import net.sf.jabref.external.ExternalFileTypeEditor;
import net.sf.jabref.external.push.PushToApplicationButton;
import net.sf.jabref.external.push.PushToApplications;
import net.sf.jabref.groups.EntryTableTransferHandler;
import net.sf.jabref.groups.GroupSelector;
import net.sf.jabref.gui.menus.help.ForkMeOnGitHubAction;
import net.sf.jabref.gui.help.HelpAction;
import net.sf.jabref.gui.help.HelpDialog;
import net.sf.jabref.gui.journals.ManageJournalsAction;
import net.sf.jabref.model.entry.BibEntry;
import net.sf.jabref.model.entry.BibtexEntryTypes;
import net.sf.jabref.model.entry.EntryType;
import net.sf.jabref.model.entry.IEEETranEntryTypes;
import net.sf.jabref.openoffice.OpenOfficePanel;
import net.sf.jabref.specialfields.Printed;
import net.sf.jabref.specialfields.Priority;
import net.sf.jabref.specialfields.Quality;
import net.sf.jabref.specialfields.Rank;
import net.sf.jabref.specialfields.ReadStatus;
import net.sf.jabref.specialfields.Relevance;
import net.sf.jabref.specialfields.SpecialFieldsUtils;
import net.sf.jabref.specialfields.*;
import net.sf.jabref.sql.importer.DbImportAction;
import net.sf.jabref.util.ManageKeywordsAction;
import net.sf.jabref.util.MassSetFieldAction;
import com.jgoodies.looks.HeaderStyle;
import com.jgoodies.looks.Options;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import osx.macadapter.MacAdapter;

import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import java.awt.*;
import java.awt.event.*;
import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;

/**
* The main window of the application.
*/
public class JabRefFrame extends JFrame implements OutputPrinter {

private static final Log LOGGER = LogFactory.getLog(JabRefFrame.class);

private static final boolean biblatexMode = Globals.prefs.getBoolean(JabRefPreferences.BIBLATEX_MODE);
Expand Down Expand Up @@ -143,7 +129,7 @@ public void actionPerformed(ActionEvent e) {
// construct view
JTable table = new JTable(
model,
new Object[]{"key", "field", "message"}
new Object[] {"key", "field", "message"}
);

table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
Expand Down Expand Up @@ -177,7 +163,8 @@ public void valueChanged(ListSelectionEvent e) {
}
};

class ToolBar extends JToolBar {
class ToolBar extends OSXCompatibleToolbar {

void addAction(Action a) {
JButton b = new JButton(a);
b.setText(null);
Expand All @@ -203,11 +190,8 @@ void addJToogleButton(JToggleButton button) {
}
add(button);
}


}


private final ToolBar tlb = new ToolBar();

private final JMenuBar mb = new JMenuBar();
Expand Down Expand Up @@ -347,6 +331,7 @@ void addJToogleButton(JToggleButton button) {
Globals.getKeyPrefs().getKey(KeyBinding.EDIT_STRINGS),
IconTheme.JabRefIcon.EDIT_STRINGS.getIcon());
private final AbstractAction toggleToolbar = new AbstractAction(Localization.menuTitle("Hide/show toolbar")) {

{
putValue(Action.ACCELERATOR_KEY, Globals.getKeyPrefs().getKey(KeyBinding.HIDE_SHOW_TOOLBAR));
putValue(Action.SHORT_DESCRIPTION, Localization.lang("Hide/show toolbar"));
Expand All @@ -367,7 +352,6 @@ public void actionPerformed(ActionEvent e) {
Localization.lang("Remove from group"));
private final AbstractAction moveToGroup = new GeneralAction(Actions.MOVE_TO_GROUP, Localization.lang("Move to group"));


private final AbstractAction togglePreview = new GeneralAction(Actions.TOGGLE_PREVIEW,
Localization.menuTitle("Toggle entry preview"),
Localization.lang("Toggle entry preview"),
Expand Down Expand Up @@ -412,7 +396,6 @@ public void actionPerformed(ActionEvent e) {
Localization.menuTitle("New entry from plain text"),
Globals.getKeyPrefs().getKey(KeyBinding.NEW_FROM_PLAIN_TEXT));


private final AbstractAction customExpAction = new CustomizeExportsAction();
private final AbstractAction customImpAction = new CustomizeImportsAction();
private final AbstractAction customFileTypesAction = ExternalFileTypeEditor.getAction(this);
Expand Down Expand Up @@ -573,6 +556,7 @@ private void init() {
setIconImage(new ImageIcon(IconTheme.getIconUrl("jabrefIcon48")).getImage());
setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
addWindowListener(new WindowAdapter() {

@Override
public void windowClosing(WindowEvent e) {
if (OS.OS_X) {
Expand All @@ -599,6 +583,7 @@ public void windowClosing(WindowEvent e) {

// Set up a ComponentListener that saves the last size and position of the dialog
this.addComponentListener(new ComponentAdapter() {

@Override
public void componentResized(ComponentEvent e) {
// Save dialog position
Expand All @@ -621,6 +606,7 @@ public void componentMoved(ComponentEvent e) {
* cut/paste/copy operations would some times occur in the wrong tab.
*/
tabbedPane.addChangeListener(new ChangeListener() {

@Override
public void stateChanged(ChangeEvent e) {
markActiveBasePanel();
Expand Down Expand Up @@ -957,7 +943,7 @@ private void initLayout() {
gbl.setConstraints(contentPane, con);
getContentPane().add(contentPane);

UIManager.put("TabbedPane.contentBorderInsets", new Insets(0,0,0,0));
UIManager.put("TabbedPane.contentBorderInsets", new Insets(0, 0, 0, 0));

contentPane.setRightComponent(tabbedPane);
contentPane.setLeftComponent(sidePaneManager.getPanel());
Expand Down Expand Up @@ -1277,7 +1263,7 @@ private void fillMenu() {

bibtex.add(newEntryAction);

for(NewEntryAction a : newSpecificEntryAction) {
for (NewEntryAction a : newSpecificEntryAction) {
newSpec.add(a);
}

Expand Down Expand Up @@ -1348,7 +1334,6 @@ private void fillMenu() {
createDisabledIconsForMenuEntries(mb);
}


public static JMenu subMenu(String name) {
int i = name.indexOf('&');
JMenu res;
Expand Down Expand Up @@ -1474,11 +1459,9 @@ public void stopShowingSearchResults() {
}
}


private List<Object> openDatabaseOnlyActions = new LinkedList<>();
private List<Object> severalDatabasesOnlyActions = new LinkedList<>();


private void initActions() {
openDatabaseOnlyActions = new LinkedList<>();
openDatabaseOnlyActions.addAll(Arrays.asList(manageSelectors, mergeDatabaseAction, newSubDatabaseAction, save,
Expand Down Expand Up @@ -1528,7 +1511,6 @@ private static void setEnabled(List<Object> list, boolean enabled) {
}
}


private int previousTabCount = -1;

/**
Expand Down Expand Up @@ -1586,14 +1568,13 @@ public BasePanel addTab(BibDatabase db, File file, MetaData metaData, Charset en
return bp;
}


private List<String> collectDatabaseFilePaths() {
List<String> dbPaths = new ArrayList<>(getBasePanelCount());

for (int i = 0; i < getBasePanelCount(); i++) {
try {
// db file exists
if(getBasePanelAt(i).getDatabaseFile() == null) {
if (getBasePanelAt(i).getDatabaseFile() == null) {
dbPaths.add("");
} else {
dbPaths.add(getBasePanelAt(i).getDatabaseFile().getCanonicalPath());
Expand Down Expand Up @@ -1621,7 +1602,7 @@ public void updateAllTabTitles() {
// remove filename
uniqPath = uniqPath.substring(0, uniqPath.lastIndexOf(File.separator));
tabbedPane.setTitleAt(i, getBasePanelAt(i).getTabTitle() + " \u2014 " + uniqPath);
} else if((file != null) && uniqPath.equals(file.getName())) {
} else if ((file != null) && uniqPath.equals(file.getName())) {
// set original filename (again)
tabbedPane.setTitleAt(i, getBasePanelAt(i).getTabTitle());
}
Expand Down Expand Up @@ -1659,8 +1640,8 @@ public void createDisabledIconsForMenuEntries(MenuElement menuElement) {
}
}


class SelectKeysAction extends AbstractAction {

public SelectKeysAction() {
super(Localization.lang("Customize key bindings"));
this.putValue(Action.SMALL_ICON, IconTheme.JabRefIcon.KEY_BINDINGS.getSmallIcon());
Expand All @@ -1680,6 +1661,7 @@ public void actionPerformed(ActionEvent e) {
* The action concerned with closing the window.
*/
class CloseAction extends MnemonicAwareAction {

public CloseAction() {
putValue(Action.NAME, Localization.menuTitle("Quit"));
putValue(Action.SHORT_DESCRIPTION, Localization.lang("Quit JabRef"));
Expand Down Expand Up @@ -1714,7 +1696,6 @@ public void actionPerformed(ActionEvent e) {
}
}


/**
* This method does the job of adding imported entries into the active
* database, or into a new one. It shows the ImportInspectionDialog if
Expand Down Expand Up @@ -1868,7 +1849,6 @@ class ChangeTabAction extends MnemonicAwareAction {

private final boolean next;


public ChangeTabAction(boolean next) {
putValue(Action.NAME, next ? Localization.menuTitle("Next tab") :
Localization.menuTitle("Previous tab"));
Expand Down Expand Up @@ -1979,7 +1959,6 @@ class DatabasePropertiesAction extends MnemonicAwareAction {

private DatabasePropertiesDialog propertiesDialog;


public DatabasePropertiesAction() {
putValue(Action.NAME, Localization.menuTitle("Database properties"));
}
Expand All @@ -2000,7 +1979,6 @@ class BibtexKeyPatternAction extends MnemonicAwareAction {

private BibtexKeyPatternDialog bibtexKeyPatternDialog;


public BibtexKeyPatternAction() {
putValue(Action.NAME, Localization.lang("Bibtex key patterns"));
}
Expand Down Expand Up @@ -2087,7 +2065,6 @@ public boolean isOpaque() {
}
}


@Override
public void showMessage(Object message, String title, int msgType) {
JOptionPane.showMessageDialog(this, message, title, msgType);
Expand Down Expand Up @@ -2121,7 +2098,7 @@ private void closeTab(BasePanel panel) {
}

if (panel.isModified()) {
if(confirmClose(panel)) {
if (confirmClose(panel)) {
removeTab(panel);
}
} else {
Expand Down Expand Up @@ -2153,7 +2130,7 @@ private boolean confirmClose(BasePanel panel) {
// do not close
}

} else if(answer == JOptionPane.NO_OPTION) {
} else if (answer == JOptionPane.NO_OPTION) {
// discard changes
close = true;
}
Expand All @@ -2175,6 +2152,7 @@ private void removeTab(BasePanel panel) {
}

public class CloseDatabaseAction extends MnemonicAwareAction {

public CloseDatabaseAction() {
super(IconTheme.JabRefIcon.CLOSE.getSmallIcon());
putValue(Action.NAME, Localization.menuTitle("Close database"));
Expand All @@ -2189,24 +2167,26 @@ public void actionPerformed(ActionEvent e) {
}

public class CloseAllDatabasesAction extends MnemonicAwareAction {

@Override
public void actionPerformed(ActionEvent e) {
final Component[] panels = tabbedPane.getComponents();

for(Component p : panels) {
for (Component p : panels) {
closeTab((BasePanel) p);
}
}
}

public class CloseOtherDatabasesAction extends MnemonicAwareAction {

@Override
public void actionPerformed(ActionEvent e) {
final BasePanel active = getCurrentBasePanel();
final Component[] panels = tabbedPane.getComponents();

for(Component p : panels) {
if(p != active) {
for (Component p : panels) {
if (p != active) {
closeTab((BasePanel) p);
}
}
Expand Down

0 comments on commit 2a3b454

Please sign in to comment.