added ability to remove files from project.

eyecreate · Mar 14, 2012 · 3597b84 · 3597b84
1 parent 0a2e4c2
commit 3597b84
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 1 deletion.
diff --git a/res/menu/editormenu.xml b/res/menu/editormenu.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:id="@+id/savefile" android:showAsAction="withText" android:title="@string/savefile"></item>
+    <item android:id="@+id/savefile" android:showAsAction="ifRoom|withText" android:title="@string/savefile"></item>
+    <item android:id="@+id/removefile" android:showAsAction="ifRoom|withText" android:title="@string/remove_file"></item>
 
 
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -18,4 +18,5 @@
     <string name="pickfiletype">Filetype</string>
     <string name="new_file_location">Location to Put File</string>
     <string name="create_file">Create</string>
+    <string name="remove_file">Remove Opened File</string>
 </resources>
diff --git a/src/com/eyecreate/AndroidProject.java b/src/com/eyecreate/AndroidProject.java
@@ -314,6 +314,11 @@ public void addNewFileToProject(File file)
 		triggerProjectStateSave();
 	}
 
+	public void removeFileFromProject(File file)
+	{
+		if(!projectFiles.remove(file)) triggerProjectStateSave();
+	}
+
 	public File getMainProjectFile()
 	{
 		return mainProjectFile;

diff --git a/src/com/eyecreate/DroiddeActivity.java b/src/com/eyecreate/DroiddeActivity.java
@@ -186,6 +186,13 @@ public void openFileInEditor(File f)
 		EditorFragment edFragment = (EditorFragment) fragman.findFragmentById(R.id.fileeditor);
 		edFragment.openFile(f);
 	}
+
+	public void removeFileFromProject(File f)
+	{
+		ProjectFilesFragment projectFiles = (ProjectFilesFragment) fragman.findFragmentById(R.id.filelist);
+		loadedProject.removeFileFromProject(f);
+		projectFiles.AddFilesToList(loadedProject.getProjectFiles());
+	}
 
 	private boolean checkFileForProject(String path) {
 		DocumentBuilder builder;

diff --git a/src/com/eyecreate/EditorFragment.java b/src/com/eyecreate/EditorFragment.java
@@ -50,6 +50,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
 		    	case R.id.savefile:
 		    		if(openedFile != null) saveFile(openedFile);
 		    		return true;
+		    	case R.id.removefile:
+		    		if(openedFile != null) removeFile(openedFile);
+		    		return true;
 		        default:
 		            return super.onOptionsItemSelected(item);
 	    	}
@@ -110,6 +113,11 @@ public void openFile(File f)
 
 	 }
 
+	 public void removeFile(File f)
+	 {
+		 ((DroiddeActivity)this.getActivity()).removeFileFromProject(f);
+	 }
+
 	 public void saveFile(File f)
 	 {
 		 RichEditText ret = (RichEditText) getActivity().findViewById(R.id.editorcontent);

diff --git a/src/com/eyecreate/Project.java b/src/com/eyecreate/Project.java
@@ -32,5 +32,7 @@ public interface Project {
 	public abstract void setMainProjectFile(File f);
 
 	public abstract void addNewFileToProject(File f);
+
+	public abstract void removeFileFromProject(File f);
 
 }