eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-14 02:45:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Separate dialog for libraries, tools, and modes

Browse Source
This commit is contained in:
pesckal
2011-09-22 06:29:18 +00:00
parent ae3cfd31be
commit d89a2d39eb
8 changed files with 1391 additions and 1255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
app/src/processing/app/Base.java
View File

@@ -34,6 +34,7 @@ import java.util.zip.*;
import javax.swing.*;
import javax.swing.tree.*;
import processing.app.contribution.Contribution;
import processing.app.contribution.InstalledContribution;
import processing.core.*;
@@ -90,10 +91,16 @@ public class Base {
// A single instance of the preferences window
Preferences preferencesFrame;
// A single instance of the library manager window
ContributionManager contributionManagerFrame;
ContributionManagerDialog libraryManagerFrame;
ContributionManagerDialog toolManagerFrame;
ContributionManagerDialog modeManagerFrame;
ContributionManagerDialog updateManagerFrame;
// set to true after the first time the menu is built.
// so that the errors while building don't show up again.
boolean builtOnce;
@@ -362,8 +369,40 @@ public class Base {
buildCoreModes();
rebuildContribModes();
contributionManagerFrame = new ContributionManager();
libraryManagerFrame = new ContributionManagerDialog("Library Manager",
new ContributionListing.Filter() {
public boolean matches(Contribution contrib) {
return contrib.getType() == Contribution.Type.LIBRARY
|| contrib.getType() == Contribution.Type.LIBRARY_COMPILATION;
}
});
toolManagerFrame = new ContributionManagerDialog("Tool Manager",
new ContributionListing.Filter() {
public boolean matches(Contribution contrib) {
return contrib.getType() == Contribution.Type.TOOL;
}
});
modeManagerFrame = new ContributionManagerDialog("Mode Manager",
new ContributionListing.Filter() {
public boolean matches(Contribution contrib) {
return contrib.getType() == Contribution.Type.MODE;
}
});
updateManagerFrame = new ContributionManagerDialog("Update Manager",
new ContributionListing.Filter() {
public boolean matches(Contribution contrib) {
if (contrib instanceof InstalledContribution) {
return ContributionListing.getInstance().hasUpdates(contrib);
}
return false;
}
});
// Make sure ThinkDifferent has library examples too
defaultMode.rebuildLibraryList();
@@ -1548,13 +1587,27 @@ public class Base {
/**
* Show the library installer window.
*/
public void handleOpenContributionManager() {
contributionManagerFrame.showFrame(activeEditor);
public void handleOpenLibraryManager() {
libraryManagerFrame.showFrame(activeEditor);
// Contribution.Type.LIBRARY
}
/**
* Show the tool installer window.
*/
public void handleOpenToolManager() {
toolManagerFrame.showFrame(activeEditor);
}
/**
* Show the mode installer window.
*/
public void handleOpenModeManager() {
modeManagerFrame.showFrame(activeEditor);
}
public void handleShowUpdates() {
contributionManagerFrame.showFrame(activeEditor);
contributionManagerFrame.setFilterText("has:updates");
updateManagerFrame.showFrame(activeEditor);
}
/**
@@ -1562,7 +1615,7 @@ public class Base {
* user. Returns the number of libraries installed.
*/
public boolean handleConfirmAndInstallLibrary(File libFile) {
return contributionManagerFrame.confirmAndInstallLibrary(activeEditor, libFile) != null;
return ContributionManager.confirmAndInstallLibrary(activeEditor, libFile, null) != null;
}
// ...................................................................
@@ -1884,7 +1937,6 @@ public class Base {
}
public File getSketchbookModesFolder() {
// return new File(getSketchbookFolder(), "libraries");
return new File(sketchbookFolder, "modes");
}

89
app/src/processing/app/ContributionListPanel.java
View File

@@ -56,7 +56,7 @@ public class ContributionListPanel extends JPanel implements Scrollable, Contrib
+ "You can still intall this library manually by visiting\n"
+ "the library's website.";
ContributionManager contribManager;
ContributionManagerDialog contribManager;
TreeMap<Contribution, ContributionPanel> panelByContribution;
@@ -70,10 +70,19 @@ public class ContributionListPanel extends JPanel implements Scrollable, Contrib
protected JPanel statusPlaceholder;
public ContributionListPanel(ContributionManager libraryManager) {
ContributionListing.Filter permaFilter;
ContributionListing contribListing;
public ContributionListPanel(ContributionManagerDialog libraryManager,
ContributionListing.Filter filter) {
super();
this.contribManager = libraryManager;
this.permaFilter = filter;
contribListing = ContributionListing.getInstance();
setLayout(new GridBagLayout());
setOpaque(true);
@@ -88,7 +97,7 @@ public class ContributionListPanel extends JPanel implements Scrollable, Contrib
}
panelByContribution = new TreeMap<Contribution, ContributionPanel>(
contribManager.getListing().getComparator());
contribListing.getComparator());
statusPlaceholder = new JPanel();
statusPlaceholder.setVisible(false);
@@ -119,29 +128,31 @@ public class ContributionListPanel extends JPanel implements Scrollable, Contrib
public void contributionAdded(final Contribution contribution) {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
if (panelByContribution.containsKey(contribution)) {
return;
}
ContributionPanel newPanel = new ContributionPanel();
synchronized (panelByContribution) {
panelByContribution.put(contribution, newPanel);
}
if (newPanel != null) {
newPanel.setContribution(contribution);
if (permaFilter.matches(contribution)) {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
if (panelByContribution.containsKey(contribution)) {
return;
}
add(newPanel);
updatePanelOrdering();
updateColors();
ContributionPanel newPanel = new ContributionPanel();
synchronized (panelByContribution) {
panelByContribution.put(contribution, newPanel);
}
if (newPanel != null) {
newPanel.setContribution(contribution);
add(newPanel);
updatePanelOrdering();
updateColors();
}
}
}
});
}
}
public void contributionRemoved(final Contribution contribution) {
@@ -186,7 +197,7 @@ public class ContributionListPanel extends JPanel implements Scrollable, Contrib
synchronized (panelByContribution) {
Set<Contribution> hiddenPanels = new TreeSet(contribManager.getListing().getComparator());
Set<Contribution> hiddenPanels = new TreeSet(contribListing.getComparator());
hiddenPanels.addAll(panelByContribution.keySet());
for (Contribution info : filteredContributions) {
@@ -464,7 +475,7 @@ public class ContributionListPanel extends JPanel implements Scrollable, Contrib
if (contrib instanceof InstalledContribution) {
InstalledContribution installed = (InstalledContribution) contrib;
ContributionManager.removeFlagForDeletion(installed);
contribManager.getListing().replaceContribution(contrib, contrib);
contribListing.replaceContribution(contrib, contrib);
}
}
};
@@ -476,15 +487,17 @@ public class ContributionListPanel extends JPanel implements Scrollable, Contrib
installRemoveButton.setEnabled(false);
installProgressBar.setVisible(true);
contribManager.removeContribution((InstalledContribution) contrib,
new JProgressMonitor(installProgressBar) {
ContributionManager.removeContribution(contribManager.editor,
(InstalledContribution) contrib,
new JProgressMonitor(installProgressBar) {
public void finishedAction() {
// Finished uninstalling the library
resetInstallProgressBarState();
installRemoveButton.setEnabled(true);
}
});
},
contribManager.statusBar);
}
}
};
@@ -589,8 +602,8 @@ public class ContributionListPanel extends JPanel implements Scrollable, Contrib
};
iconArea.setInheritsPopupMenu(true);
iconArea.setOpaque(false);
Dimension d = new Dimension(ContributionManager.ICON_WIDTH,
ContributionManager.ICON_HEIGHT);
Dimension d = new Dimension(ContributionManagerDialog.ICON_WIDTH,
ContributionManagerDialog.ICON_HEIGHT);
iconArea.setMinimumSize(d);
iconArea.setPreferredSize(d);
@@ -654,7 +667,7 @@ public class ContributionListPanel extends JPanel implements Scrollable, Contrib
public void actionPerformed(ActionEvent e) {
updateButton.setEnabled(false);
AdvertisedContribution ad = contribManager.getListing()
AdvertisedContribution ad = contribListing
.getAdvertisedContribution(contrib);
String url = ad.link;
installContribution(ad, url);
@@ -766,7 +779,7 @@ public class ContributionListPanel extends JPanel implements Scrollable, Contrib
descriptionText.setText(description.toString());
setAlignment(descriptionText, StyleConstants.ALIGN_JUSTIFIED);
if (contribManager.getListing().hasUpdates(contrib)) {
if (contribListing.hasUpdates(contrib)) {
StringBuilder versionText = new StringBuilder();
versionText.append("<html><body><i>");
if (isFlagged) {
@@ -788,7 +801,7 @@ public class ContributionListPanel extends JPanel implements Scrollable, Contrib
updateButton.setEnabled(true);
if (contrib != null && !ContributionManager.requiresRestart(contrib)) {
updateButton.setVisible(isSelected()
&& contribManager.getListing().hasUpdates(contrib));
&& contribListing.hasUpdates(contrib));
}
installRemoveButton.removeActionListener(installActionListener);
@@ -836,7 +849,8 @@ public class ContributionListPanel extends JPanel implements Scrollable, Contrib
installProgressBar.setVisible(true);
contribManager.downloadAndInstall(downloadUrl, ad,
ContributionManager.downloadAndInstall(contribManager.editor,
downloadUrl, ad,
new JProgressMonitor(installProgressBar) {
public void finishedAction() {
@@ -855,7 +869,8 @@ public class ContributionListPanel extends JPanel implements Scrollable, Contrib
+ "downloading the contribution.");
}
}
}
},
contribManager.statusBar
);
} catch (MalformedURLException e) {
@@ -925,7 +940,7 @@ public class ContributionListPanel extends JPanel implements Scrollable, Contrib
if (contrib != null && !ContributionManager.requiresRestart(contrib)) {
updateButton.setVisible(isSelected()
&& contribManager.getListing().hasUpdates(contrib));
&& contribListing.hasUpdates(contrib));
}
installRemoveButton.setVisible(isSelected());

15
app/src/processing/app/ContributionListing.java
View File

@@ -60,7 +60,9 @@ public class ContributionListing {
File listingFile;
public ContributionListing() {
static ContributionListing singleInstance;
private ContributionListing() {
listeners = new ArrayList<ContributionChangeListener>();
advertisedContributions = new ArrayList<AdvertisedContribution>();
librariesByCategory = new HashMap<String, List<Contribution>>();
@@ -73,7 +75,13 @@ public class ContributionListing {
setAdvertisedList(listingFile);
}
}
static public ContributionListing getInstance() {
if (singleInstance == null)
singleInstance = new ContributionListing();
return singleInstance;
}
void setAdvertisedList(File file) {
@@ -566,4 +574,9 @@ public class ContributionListing {
return downloadingListingLock.isLocked();
}
static interface Filter {
boolean matches(Contribution contrib);
}
}

1877
app/src/processing/app/ContributionManager.java
View File

File diff suppressed because it is too large Load Diff

547
app/src/processing/app/ContributionManagerDialog.java Normal file
View File

@@ -0,0 +1,547 @@
/* -*- mode: java; c-basic-offset: 2; indent-tabs-mode: nil -*- */
/*
Part of the Processing project - http://processing.org
Copyright (c) 2004-11 Ben Fry and Casey Reas
Copyright (c) 2001-04 Massachusetts Institute of Technology
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
package processing.app;
import java.awt.*;
import java.awt.event.*;
import java.awt.image.CropImageFilter;
import java.awt.image.FilteredImageSource;
import java.io.*;
import java.util.*;
import java.util.List;
import javax.imageio.ImageIO;
import javax.swing.*;
import javax.swing.event.*;
import processing.app.contribution.*;
public class ContributionManagerDialog {
static final String ANY_CATEGORY = "All";
/** Width of each contribution icon. */
static final int ICON_WIDTH = 25;
/** Height of each contribution icon. */
static final int ICON_HEIGHT = 20;
JFrame dialog;
private String title;
FilterField filterField;
JScrollPane scrollPane;
ContributionListPanel contributionListPanel;
StatusPanel statusBar;
JComboBox categoryChooser;
Image[] contributionIcons;
// the calling editor, so updates can be applied
Editor editor;
String category;
ContributionListing contribListing;
public ContributionManagerDialog(String title,
ContributionListing.Filter filter) {
this.title = title;
contribListing = ContributionListing.getInstance();
contributionListPanel = new ContributionListPanel(this, filter);
contribListing.addContributionListener(contributionListPanel);
}
protected void showFrame(Editor editor) {
this.editor = editor;
if (dialog == null) {
dialog = new JFrame(title);
Base.setIcon(dialog);
createComponents();
registerDisposeListeners();
dialog.pack();
Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
dialog.setLocation((screen.width - dialog.getWidth()) / 2,
(screen.height - dialog.getHeight()) / 2);
contributionListPanel.grabFocus();
}
dialog.setVisible(true);
if (!contribListing.hasDownloadedLatestList()) {
contribListing.getAdvertisedContributions(new AbstractProgressMonitor() {
public void startTask(String name, int maxValue) {
}
public void finished() {
super.finished();
updateContributionListing();
updateCategoryChooser();
if (isError()) {
statusBar.setErrorMessage("An error occured when downloading " +
"the list of available contributions.");
}
}
});
}
updateContributionListing();
if (contributionIcons == null) {
try {
Image allButtons = ImageIO.read(Base.getLibStream("contributions.gif"));
int count = allButtons.getHeight(dialog) / ContributionManagerDialog.ICON_HEIGHT;
contributionIcons = new Image[count];
contributionIcons[0] = allButtons;
contributionIcons[1] = allButtons;
contributionIcons[2] = allButtons;
contributionIcons[3] = allButtons;
for (int i = 0; i < count; i++) {
Image image = dialog.createImage(
new FilteredImageSource(allButtons.getSource(),
new CropImageFilter(0, i * ContributionManagerDialog.ICON_HEIGHT,
ContributionManagerDialog.ICON_WIDTH,
ContributionManagerDialog.ICON_HEIGHT)));
contributionIcons[i] = image;
}
contributionListPanel.updateColors();
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
}
public Image getContributionIcon(Contribution.Type type) {
if (contributionIcons == null)
return null;
switch (type) {
case LIBRARY:
return contributionIcons[0];
case TOOL:
return contributionIcons[1];
case MODE:
return contributionIcons[2];
case LIBRARY_COMPILATION:
return contributionIcons[3];
}
return null;
}
/**
* Close the window after an OK or Cancel.
*/
protected void disposeFrame() {
dialog.dispose();
editor = null;
}
/** Creates and arranges the Swing components in the dialog. */
private void createComponents() {
dialog.setResizable(true);
Container pane = dialog.getContentPane();
pane.setLayout(new GridBagLayout());
{ // The filter text area
GridBagConstraints c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 0;
c.gridwidth = 2;
c.weightx = 1;
c.fill = GridBagConstraints.HORIZONTAL;
filterField = new FilterField();
pane.add(filterField, c);
}
{ // The scroll area containing the contribution listing and the status bar.
GridBagConstraints c = new GridBagConstraints();
c.fill = GridBagConstraints.BOTH;
c.gridx = 0;
c.gridy = 1;
c.gridwidth = 2;
c.weighty = 1;
c.weightx = 1;
scrollPane = new JScrollPane();
scrollPane.setPreferredSize(new Dimension(300, 300));
scrollPane.setViewportView(contributionListPanel);
scrollPane.getViewport().setOpaque(true);
scrollPane.getViewport().setBackground(contributionListPanel.getBackground());
scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
statusBar = new StatusPanel();
statusBar.setBorder(BorderFactory.createEtchedBorder());
final JLayeredPane layeredPane = new JLayeredPane();
layeredPane.add(scrollPane, JLayeredPane.DEFAULT_LAYER);
layeredPane.add(statusBar, JLayeredPane.PALETTE_LAYER);
layeredPane.addComponentListener(new ComponentAdapter() {
void resizeLayers() {
scrollPane.setSize(layeredPane.getSize());
scrollPane.updateUI();
}
public void componentShown(ComponentEvent e) {
resizeLayers();
}
public void componentResized(ComponentEvent arg0) {
resizeLayers();
}
});
final JViewport viewport = scrollPane.getViewport();
viewport.addComponentListener(new ComponentAdapter() {
void resizeLayers() {
statusBar.setLocation(0, viewport.getHeight() - 18);
Dimension d = viewport.getSize();
d.height = 20;
d.width += 3;
statusBar.setSize(d);
}
public void componentShown(ComponentEvent e) {
resizeLayers();
}
public void componentResized(ComponentEvent e) {
resizeLayers();
}
});
pane.add(layeredPane, c);
}
{ // Shows "Category:"
GridBagConstraints c = new GridBagConstraints();
c.gridx = 0;
c.gridy = 2;
pane.add(new Label("Category:"), c);
}
{ // Combo box for selecting a category
GridBagConstraints c = new GridBagConstraints();
c.fill = GridBagConstraints.HORIZONTAL;
c.gridx = 1;
c.gridy = 2;
categoryChooser = new JComboBox();
updateCategoryChooser();
pane.add(categoryChooser, c);
categoryChooser.addItemListener(new ItemListener() {
public void itemStateChanged(ItemEvent e) {
category = (String) categoryChooser.getSelectedItem();
if (ContributionManagerDialog.ANY_CATEGORY.equals(category)) {
category = null;
}
filterLibraries(category, filterField.filters);
}
});
}
dialog.setMinimumSize(new Dimension(550, 400));
}
private void updateCategoryChooser() {
if (categoryChooser == null)
return;
ArrayList<String> categories;
categoryChooser.removeAllItems();
categories = new ArrayList<String>(contribListing.getCategories());
Collections.sort(categories);
categories.add(0, ContributionManagerDialog.ANY_CATEGORY);
for (String s : categories) {
categoryChooser.addItem(s);
}
}
private void registerDisposeListeners() {
dialog.addWindowListener(new WindowAdapter() {
public void windowClosing(WindowEvent e) {
disposeFrame();
}
});
ActionListener disposer = new ActionListener() {
public void actionPerformed(ActionEvent actionEvent) {
disposeFrame();
}
};
Base.registerWindowCloseKeys(dialog.getRootPane(), disposer);
// handle window closing commands for ctrl/cmd-W or hitting ESC.
dialog.getContentPane().addKeyListener(new KeyAdapter() {
public void keyPressed(KeyEvent e) {
//System.out.println(e);
KeyStroke wc = Base.WINDOW_CLOSE_KEYSTROKE;
if ((e.getKeyCode() == KeyEvent.VK_ESCAPE) ||
(KeyStroke.getKeyStrokeForEvent(e).equals(wc))) {
disposeFrame();
}
}
});
}
public void filterLibraries(String category, List<String> filters) {
List<Contribution> filteredLibraries = contribListing
.getFilteredLibraryList(category, filters);
contributionListPanel.filterLibraries(filteredLibraries);
}
protected void updateContributionListing() {
if (editor == null)
return;
ArrayList<Library> libraries = editor.getMode().contribLibraries;
ArrayList<LibraryCompilation> compilations = LibraryCompilation.list(libraries);
// Remove libraries from the list that are part of a compilations
for (LibraryCompilation compilation : compilations) {
Iterator<Library> it = libraries.iterator();
while (it.hasNext()) {
Library current = it.next();
if (compilation.getFolder().equals(current.getFolder().getParentFile())) {
it.remove();
}
}
}
ArrayList<Contribution> contributions = new ArrayList<Contribution>();
contributions.addAll(editor.contribTools);
contributions.addAll(libraries);
contributions.addAll(compilations);
contribListing.updateInstalledList(contributions);
}
public void setFilterText(String filter) {
if (filter == null || filter.isEmpty()) {
filterField.setText("");
filterField.isShowingHint = true;
} else {
filterField.setText(filter);
filterField.isShowingHint = false;
}
filterField.applyFilter();
}
class FilterField extends JTextField {
final static String filterHint = "Filter your search...";
boolean isShowingHint;
List<String> filters;
public FilterField () {
super(filterHint);
isShowingHint = true;
filters = new ArrayList<String>();
addFocusListener(new FocusListener() {
public void focusLost(FocusEvent focusEvent) {
if (filterField.getText().isEmpty()) {
isShowingHint = true;
}
updateStyle();
}
public void focusGained(FocusEvent focusEvent) {
if (isShowingHint) {
isShowingHint = false;
filterField.setText("");
}
updateStyle();
}
});
getDocument().addDocumentListener(new DocumentListener() {
public void removeUpdate(DocumentEvent e) {
applyFilter();
}
public void insertUpdate(DocumentEvent e) {
applyFilter();
}
public void changedUpdate(DocumentEvent e) {
applyFilter();
}
});
}
public void applyFilter() {
String filter = filterField.getFilterText();
filter = filter.toLowerCase();
// Replace anything but 0-9, a-z, or : with a space
filter = filter.replaceAll("[^\\x30-\\x39^\\x61-\\x7a^\\x3a]", " ");
filters = Arrays.asList(filter.split(" "));
filterLibraries(category, filters);
}
public String getFilterText() {
return isShowingHint ? "" : getText();
}
public void updateStyle() {
if (isShowingHint) {
filterField.setText(filterHint);
// setForeground(UIManager.getColor("TextField.light")); // too light
setForeground(Color.gray);
} else {
setForeground(UIManager.getColor("TextField.foreground"));
}
}
}
public boolean hasAlreadyBeenOpened() {
return dialog != null;
}
class StatusPanel extends JPanel implements ErrorWidget {
String errorMessage;
StatusPanel() {
addMouseListener(new MouseAdapter() {
public void mousePressed(MouseEvent e) {
clearErrorMessage();
}
});
}
@Override
protected void paintComponent(Graphics g) {
super.paintComponent(g);
g.setFont(new Font("SansSerif", Font.PLAIN, 10));
int baseline = (getSize().height + g.getFontMetrics().getAscent()) / 2;
if (contribListing.isDownloadingListing()) {
g.setColor(Color.black);
g.drawString("Downloading software listing...", 2, baseline);
setVisible(true);
} else if (errorMessage != null) {
g.setColor(Color.red);
g.drawString(errorMessage, 2, baseline);
setVisible(true);
} else {
setVisible(false);
}
}
public void setErrorMessage(String message) {
errorMessage = message;
setVisible(true);
JPanel placeholder = ContributionManagerDialog.this.contributionListPanel.statusPlaceholder;
Dimension d = getPreferredSize();
if (Base.isWindows()) {
d.height += 5;
placeholder.setPreferredSize(d);
}
placeholder.setVisible(true);
// Rectangle rect = scrollPane.getViewport().getViewRect();
// rect.x += d.height;
// scrollPane.getViewport().scrollRectToVisible(rect);
}
void clearErrorMessage() {
errorMessage = null;
repaint();
ContributionManagerDialog.this.contributionListPanel.statusPlaceholder
.setVisible(false);
}
}
}
abstract class JProgressMonitor extends AbstractProgressMonitor {
JProgressBar progressBar;
public JProgressMonitor(JProgressBar progressBar) {
this.progressBar = progressBar;
}
public void startTask(String name, int maxValue) {
isFinished = false;
progressBar.setString(name);
progressBar.setIndeterminate(maxValue == UNKNOWN);
progressBar.setMaximum(maxValue);
}
public void setProgress(int value) {
super.setProgress(value);
progressBar.setValue(value);
}
@Override
public void finished() {
super.finished();
finishedAction();
}
public abstract void finishedAction();
}

27
app/src/processing/app/Editor.java
View File

@@ -363,6 +363,15 @@ public abstract class Editor extends JFrame implements RunnerListener {
modeMenu.add(item);
}
}
modeMenu.addSeparator();
JMenuItem addLib = new JMenuItem("Add Mode...");
addLib.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
base.handleOpenModeManager();
}
});
modeMenu.add(addLib);
}
@@ -870,20 +879,20 @@ public abstract class Editor extends JFrame implements RunnerListener {
toolsMenu.removeAll();
}
JMenuItem item = new JMenuItem("Manage Contributions...");
item.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
base.handleOpenContributionManager();
}
});
toolsMenu.add(item);
toolsMenu.addSeparator();
rebuildToolList();
addInternalTools(toolsMenu);
addTools(toolsMenu, coreTools);
addTools(toolsMenu, contribTools);
toolsMenu.addSeparator();
JMenuItem item = new JMenuItem("Add Tool...");
item.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
base.handleOpenToolManager();
}
});
toolsMenu.add(item);
}

9
app/src/processing/app/Mode.java
View File

@@ -224,6 +224,15 @@ public abstract class Mode {
importMenu.removeAll();
}
JMenuItem addLib = new JMenuItem("Add Library...");
addLib.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
base.handleOpenLibraryManager();
}
});
importMenu.add(addLib);
importMenu.addSeparator();
rebuildLibraryList();
ActionListener listener = new ActionListener() {

8
app/src/processing/app/UpdateCheck.java
View File

@@ -123,8 +123,12 @@ public class UpdateCheck {
// Wait for xml file to be downloaded and updates to come in. (this
// should really be handled better).
Thread.sleep(5 * 1000);
if (!base.contributionManagerFrame.hasAlreadyBeenOpened() &&
base.contributionManagerFrame.contribListing.hasUpdates()) {
if (!base.libraryManagerFrame.hasAlreadyBeenOpened()
&& base.libraryManagerFrame.contribListing.hasUpdates()
|| !base.toolManagerFrame.hasAlreadyBeenOpened()
&& base.toolManagerFrame.contribListing.hasUpdates()
|| !base.modeManagerFrame.hasAlreadyBeenOpened()
&& base.modeManagerFrame.contribListing.hasUpdates()) {
promptToOpenContributionManager();
}
}