From 5f71502fa3d0e4a942dbb776a697a5f84d1c72dc Mon Sep 17 00:00:00 2001
From: Marius Gavrilescu <marius@ieval.ro>
Date: Wed, 21 Aug 2013 15:51:52 +0300
Subject: [PATCH] Better display event menu

---
 res/menu/event.xml                            | 36 ++++++++-----------
 res/values/strings.xml                        |  3 +-
 src/ro/ieval/unical/DisplayEventActivity.java |  4 ---
 3 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/res/menu/event.xml b/res/menu/event.xml
index 9b40a38..abef50d 100644
--- a/res/menu/event.xml
+++ b/res/menu/event.xml
@@ -1,26 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:id="@+id/deleteevent"
-          android:icon="@android:drawable/ic_menu_delete"
-          android:title="Delete Event"
-          android:titleCondensed="DELETE"
-          android:showAsAction="always">
+  <item android:id="@+id/edit_event"
+		android:icon="@android:drawable/ic_menu_edit"
+		android:title="@string/edit_event"
+        android:showAsAction="ifRoom">
+  </item>
 
-    </item>
+  <item android:id="@+id/deleteevent"
+        android:icon="@android:drawable/ic_menu_delete"
+        android:title="@string/delete_event"
+        android:showAsAction="ifRoom">
+  </item>
 
-    <item android:id="@+id/edit_event"
-          android:title="@string/edit_event"
-          android:showAsAction="ifRoom">
-    </item>
-
-    <item android:id="@+id/eventlist"
-          android:title="@string/eventlist"
-          android:showAsAction="ifRoom">
-    </item>
-
-	<item android:id="@+id/add_alarm"
-		  android:title="@string/add_alarm"
-		  android:icon="@android:drawable/ic_menu_add"
-		  android:showAsAction="ifRoom">
-	</item>
+  <item android:id="@+id/add_alarm"
+		android:title="@string/add_alarm"
+		android:icon="@android:drawable/ic_menu_add"
+		android:showAsAction="ifRoom">
+  </item>
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index edc2770..c491c2c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -46,10 +46,11 @@
     <string name="years">years</string>
     <string name="refresh">Refresh</string>
     <string name="stop_alarm">Stop Alarm</string>
-    <string name="edit_event">Edit Event</string>
+    <string name="edit_event">Edit event</string>
 	<string name="add_alarm">Add alarm</string>
 	<string name="delete">Delete</string>
 	<string name="alarms">Alarms</string>
+	<string name="delete_event">Delete event</string>
 
     <string-array name="repeat_array_s">
         <item>Day</item>
diff --git a/src/ro/ieval/unical/DisplayEventActivity.java b/src/ro/ieval/unical/DisplayEventActivity.java
index 18f6ef9..31e0626 100644
--- a/src/ro/ieval/unical/DisplayEventActivity.java
+++ b/src/ro/ieval/unical/DisplayEventActivity.java
@@ -112,10 +112,6 @@ public class DisplayEventActivity extends Activity {
             d.setArguments(b);
 			d.show(getFragmentManager(), "Delete");
 
-			return true;
-		case R.id.eventlist:
-			final Intent it=new Intent(this, EventListActivity.class);
-			startActivity(it);
 			return true;
 		case R.id.edit_event:
 			AddEventActivity.editEvent(this, event);
-- 
2.30.2