Skip to content

Fix for #2944 sketchbook updates properly without restarting on all occasions #3178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
JayDusara wants to merge 8 commits into from
Closed

Fix for #2944 sketchbook updates properly without restarting on all occasions #3178

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0186713
Merge remote-tracking branch 'upstream/master'
JayDusara Apr 4, 2015
761ec1d
removing conflicts
JayDusara Apr 5, 2015
239e0eb
Merge remote-tracking branch 'upstream/master'
JayDusara Apr 5, 2015
50a14e7
code cleanup
JayDusara Apr 5, 2015
cd6834f
Dont rebuild tree if model is not initialized
JayDusara Apr 5, 2015
1a6ea90
merging changes from original repo
JayDusara Apr 10, 2015
e941eaf
Merge remote-tracking branch 'upstream/master'
JayDusara Apr 10, 2015
dce7b5d
merging phase
JayDusara Apr 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
code cleanup
  • Loading branch information
@JayDusara
JayDusara committed Apr 5, 2015
commit 50a14e75241fbc4b3a6ee03230acb37c45937534
11 changes: 5 additions & 6 deletions app/src/processing/app/Mode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,7 +1127,7 @@ public DefaultMutableTreeNode buildSketchbookTree(){
}
return sbNode;
}

protected JFrame sketchbookFrame;

/*
Expand Down Expand Up @@ -1168,11 +1168,10 @@ public void showSketchbookFrame() {
Toolkit.setIcon(sketchbookFrame);
Toolkit.registerWindowCloseKeys(sketchbookFrame.getRootPane(),
new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
sketchbookFrame.setVisible(false);
}
});
public void actionPerformed(ActionEvent e) {
sketchbookFrame.setVisible(false);
}
});

sketchbookFrame.getContentPane().setLayout(new BorderLayout());
DefaultMutableTreeNode root = buildSketchbookTree();
Expand Down
2 changes: 1 addition & 1 deletion app/src/processing/app/Sketch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,7 +799,7 @@ public boolean save() throws IOException {
protected boolean saveAs() throws IOException {
String newParentDir = null;
String newName = null;

final String oldName2 = folder.getName();
// TODO rewrite this to use shared version from PApplet
final String PROMPT = Language.text("save");
Expand Down
183 changes: 0 additions & 183 deletions app/src/processing/app/contrib/ProgressMonitor.java
View file
Open in desktop

This file was deleted.

Loading