Skip to content

Commit 9186b8d

Browse files
committed
Disable sketch folder deletion
This feature was too sketchy for most users, we don't need it
1 parent 365d36e commit 9186b8d

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

app/src/processing/app/Sketch.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -659,11 +659,17 @@ public void handleDeleteCode() {
659659
return;
660660
}
661661

662+
if(currentIndex == 0){
663+
JOptionPane.showMessageDialog(editor,
664+
Language.interpolate("warn.delete.sketch_last", getName()),
665+
Language.text("warn.delete"),
666+
JOptionPane.ERROR_MESSAGE);
667+
return;
668+
}
669+
662670
// confirm deletion with user, yes/no
663671
Object[] options = { Language.text("prompt.ok"), Language.text("prompt.cancel") };
664-
String prompt = (currentIndex == 0) ?
665-
Language.interpolate("warn.delete.sketch_folder", getName()) :
666-
Language.interpolate("warn.delete.sketch_file", current.getPrettyName());
672+
String prompt = Language.interpolate("warn.delete.sketch_file", current.getPrettyName());
667673
int result = JOptionPane.showOptionDialog(editor,
668674
prompt,
669675
Language.text("warn.delete"),
@@ -672,6 +678,7 @@ public void handleDeleteCode() {
672678
null,
673679
options,
674680
options[0]);
681+
// TODO: Remove the code to remove the entire sketch folder
675682
if (result == JOptionPane.YES_OPTION) {
676683
if (currentIndex == 0) { // delete the entire sketch
677684
// need to unset all the modified flags, otherwise tries

build/shared/lib/languages/PDE.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,7 @@ contrib.import.errors.link = Error: The library %s has a strange looking downloa
600600

601601
warn.delete = Delete
602602
warn.delete.sketch_folder = Are you sure you want to delete this sketch?\nThis will remove the entire “%s” folder.
603+
warn.delete.sketch_last = Sorry deleting the sketch folder through Processing is not supported.
603604
warn.delete.sketch_file = Are you sure you want to delete “%s”?
604605
warn.cannot_change_mode.title = Cannot change mode
605606
warn.cannot_change_mode.body = Cannot change mode,\nbecause “%s” mode is not compatible with current mode.

0 commit comments

Comments
 (0)