Merge pull request #943 from Stefterv/disable-folder-delete

Author: Stefterv

app/src/processing/app/Sketch.java

@@ -659,11 +659,25 @@ public void handleDeleteCode() {
       return;
     }
 
+    if(currentIndex == 0){
+      Object[] options = { Language.text("menu.sketch.show_sketch_folder"), Language.text("prompt.cancel") };
+      int result = JOptionPane.showOptionDialog(editor,
+              Language.interpolate("warn.delete.sketch_last", getName()),
+              Language.text("warn.delete"),
+              JOptionPane.YES_NO_OPTION,
+              JOptionPane.ERROR_MESSAGE,
+              null,
+              options,
+              options[1]);
+      if (result == JOptionPane.YES_OPTION) {
+        Platform.openFolder(folder);
+      }
+      return;
+    }
+
     // confirm deletion with user, yes/no
     Object[] options = { Language.text("prompt.ok"), Language.text("prompt.cancel") };
-    String prompt = (currentIndex == 0) ?
-      Language.interpolate("warn.delete.sketch_folder", getName()) :
-      Language.interpolate("warn.delete.sketch_file", current.getPrettyName());
+    String prompt = Language.interpolate("warn.delete.sketch_file", current.getPrettyName());
     int result = JOptionPane.showOptionDialog(editor,
                                               prompt,
                                               Language.text("warn.delete"),
@@ -672,6 +686,7 @@ public void handleDeleteCode() {
                                               null,
                                               options,
                                               options[0]);
+    // TODO: Remove the code to remove the entire sketch folder
     if (result == JOptionPane.YES_OPTION) {
       if (currentIndex == 0) {  // delete the entire sketch
         // need to unset all the modified flags, otherwise tries

build/shared/lib/languages/PDE.properties

@@ -600,6 +600,7 @@ contrib.import.errors.link = Error: The library %s has a strange looking downloa
 
 warn.delete = Delete
 warn.delete.sketch_folder = Are you sure you want to delete this sketch?\nThis will remove the entire “%s” folder.
+warn.delete.sketch_last = To keep your files safe, deleting the whole sketch folder is not supported in Processing. \nPlease open the sketch folder in your file explorer to delete it.
 warn.delete.sketch_file = Are you sure you want to delete “%s”?
 warn.cannot_change_mode.title = Cannot change mode
 warn.cannot_change_mode.body = Cannot change mode,\nbecause “%s” mode is not compatible with current mode.

build/shared/lib/languages/PDE_de.properties

@@ -407,6 +407,7 @@ editor.status.error.syntax = Syntaxfehler - %s
 
 warn.delete = Löschen
 warn.delete.sketch = Den Sketch endgültig löschen?
+warn.delete.sketch_last = Um deine Dateien sicher zu halten, wird das Löschen des gesamten Sketch-Ordners in Processing nicht unterstützt. \nBitte öffne den Sketch-Ordner in deinem Datei-Explorer, um ihn zu löschen.
 warn.delete.file = Die Datei "%s" entgültig löschen?
 
 

build/shared/lib/languages/PDE_el.properties

@@ -478,6 +478,7 @@ contrib.import.errors.link = Error: The library %s has a strange looking downloa
 
 warn.delete = Διαγραφή
 warn.delete.sketch = Είσαι σίγουρος ότι θέλεις να διαγραφεί το Σχέδιο;
+warn.delete.sketch_last = Για να διατηρήσετε τα αρχεία σας ασφαλή, η διαγραφή ολόκληρου του φακέλου Σχεδίου δεν υποστηρίζεται στο Processing.\nΠαρακαλούμε ανοίξτε το φάκελο Σχεδίου στον εξερευνητή αρχείων για να το διαγράψετε.
 warn.delete.file = Είσαι σίγουρος ότι θέλεις να διαγράψεις το "%s";
 
 

build/shared/lib/languages/PDE_es.properties

@@ -599,6 +599,7 @@ contrib.import.errors.link = Error: el enlace de descarga de la biblioteca «%s
 
 warn.delete = Eliminar
 warn.delete.sketch_folder = ¿Seguro que quieres eliminar el sketch?\nEsto suprimirá la carpeta «%s» y todo su contenido.
+warn.delete.sketch_last = Para mantener tus archivos seguros, no se admite eliminar toda la carpeta del sketch en Processing.\nAbre la carpeta del sketch en tu explorador de archivos para eliminarla.
 warn.delete.sketch_file = ¿Seguro que quieres eliminar el archivo «%s»?
 warn.cannot_change_mode.title = Error cambio de modo
 warn.cannot_change_mode.body = No se puede cambiar al modo «%s»\nporque no es compatible con el modo actual.

build/shared/lib/languages/PDE_fr.properties

@@ -487,7 +487,9 @@ contrib.import.errors.link = Erreur : Le lien de téléchargement de la biblioth
 # Warnings
 
 warn.delete = Supprimer
-warn.delete.sketch = Êtes-vous sûr(e) de vouloir supprimer ce sketch?
+warn.delete.sketch = Êtes-vous sûr(e) de vouloir supprimer ce sketch? \nLe dossier “%s” sera entièrement effacé.
+# warn.delete.sketch_last = To keep your files safe, deleting the whole sketch folder isn?t supported in Processing. \nPlease open the sketch folder in your file explorer to delete it.
+warn.delete.sketch_last = Pour protéger vos fichiers, la suppression du dossier de sketch entier n'est pas prise en charge dans Processing. \nVeuillez ouvrir le dossier de sketch dans votre explorateur de fichiers pour le supprimer.
 warn.delete.file = Êtes-vous sûr(e) de vouloir supprimer «%s»?
 warn.cannot_change_mode.title = Impossible de changer le mode
 warn.cannot_change_mode.body = Impossible de changer de mode, \ncar le mode "%s" n'est pas compatible avec le mode actuel.

build/shared/lib/languages/PDE_it.properties

@@ -533,6 +533,7 @@ contrib.import.errors.link = Errore: la libreria %s ha uno strano link di downlo
 
 warn.delete = Elimina
 warn.delete.sketch = Sei sicuro di voler eliminare questo sketch?
+warn.delete.sketch_last = Per mantenere i tuoi file al sicuro, l'eliminazione dell'intera cartella dello sketch non è supportata in Processing. \nPer favore apri la cartella dello sketch nel tuo esplora file per eliminarla.
 warn.delete.file = Sei sicuro di voler eliminare "%s"?
 warn.cannot_change_mode.title = Impossibile cambiare modalità
 warn.cannot_change_mode.body = Impossibile cambiare modalità,\npoichè la modalità "%s" non è compatibile con quella corrente.

build/shared/lib/languages/PDE_ja.properties

@@ -537,6 +537,7 @@ contrib.import.errors.link = Error: The library %s has a strange looking downloa
 
 warn.delete = 削除
 warn.delete.sketch = このスケッチを削除してもよろしいですか?
+warn.delete.sketch_last = ファイルの安全を保つため、Processing ではプロジェクトフォルダーの削除はサポートされていません。\nファイルエクスプローラーでプロジェクトフォルダーを開き、削除してください。
 warn.delete.file = "%s"を削除してもよろしいですか?
 warn.cannot_change_mode.title = モード変更失敗
 warn.cannot_change_mode.body = 互換性がないため、"%s"モードに切り替えられません。

build/shared/lib/languages/PDE_ko.properties

@@ -308,6 +308,7 @@ editor.status.error.syntax = 구문 오류 - %s
 
 warn.delete = 삭제
 warn.delete.sketch = 정말 해당 스케치를 삭제하시겠습니까?
+warn.delete.sketch_last = 파일의 안전을 위해 Processing에서는 프로젝트 폴더 삭제를 지원하지 않습니다. \n파일 탐색기에서 프로젝트 폴더를 열어 삭제해 주세요.
 warn.delete.file = 정말 "%s"를 삭제하시겠습니까?
 
 

build/shared/lib/languages/PDE_nl.properties

@@ -305,6 +305,7 @@ contrib.unsupported_operating_system = Uw besturingssyteem wordt schijnbaar niet
 
 warn.delete = Verwijderen
 warn.delete.sketch = Weet u zeker dat u deze schets wil verwijderen?
+warn.delete.sketch_last = Om je bestanden veilig te houden, wordt het verwijderen van de gehele schets niet ondersteund in Processing. \nOpen de schets map in je bestandsverkenner om deze te verwijderen.
 warn.delete.file = Weet u zeker dat u "%s" wil verwijderen?