popup menu fixes

3 files changed, 17 insertions, 1 deletions

diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java
index 112e66a..9b3d4ac 100644
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicListFragment.java
@@ -318,8 +318,15 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
 
 		if (c != null) {
 			menu.setHeaderTitle(c.getString(c.getColumnIndex("filename")));
+
+			int size = c.getInt(c.getColumnIndex("size"));
+
+			if (size == SIZE_DIR) {
+				menu.findItem(R.id.menu_mark_as_read).setEnabled(false);
+				menu.findItem(R.id.menu_reset_progress).setEnabled(false);
+			}
 		}
-		
+
 		super.onCreateContextMenu(menu, v, menuInfo);		
 	}
 	
@@ -332,6 +339,11 @@ public class ComicListFragment extends Fragment implements OnItemClickListener {
 		String fileName = c.getString(c.getColumnIndex("path")) + "/" + c.getString(c.getColumnIndex("filename"));
 		
 		switch (item.getItemId()) {
+		case R.id.menu_open:
+			if (fileName != null) {
+				m_activity.onComicArchiveSelected(fileName);
+			}
+			return true;
 		case R.id.menu_reset_progress:
 			if (fileName != null) {
 				m_activity.resetProgress(fileName);
diff --git a/org.fox.ttcomics/src/main/res/menu/comic_archive_context.xml b/org.fox.ttcomics/src/main/res/menu/comic_archive_context.xml
index 9954036..58bf58f 100644
--- a/org.fox.ttcomics/src/main/res/menu/comic_archive_context.xml
+++ b/org.fox.ttcomics/src/main/res/menu/comic_archive_context.xml
@@ -1,4 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/menu_open"
+        android:title="@string/menu_open" />
+
     <item android:id="@+id/menu_mark_as_read"
         android:title="@string/mark_as_read" />
     
diff --git a/org.fox.ttcomics/src/main/res/values/strings.xml b/org.fox.ttcomics/src/main/res/values/strings.xml
index e17e397..1969d1e 100755
--- a/org.fox.ttcomics/src/main/res/values/strings.xml
+++ b/org.fox.ttcomics/src/main/res/values/strings.xml
@@ -70,4 +70,5 @@
     <string name="crash_dialog_text">Unfortunately, Pow! Comics Reader has stopped. Submit crash report to tt-rss.org?</string>
     <string name="mark_as_read">Mark as read</string>
     <string name="reset_progress">Reset progress</string>
+    <string name="menu_open">Open…</string>
 </resources>
\ No newline at end of file