--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2010/07/10 16:03:10	981
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2010/07/11 14:58:13	982
@@ -19,7 +19,11 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.ContextMenu;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
+import android.view.ContextMenu.ContextMenuInfo;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.ListView;
@@ -31,6 +35,8 @@
 public class DepartureList extends ListActivity {
 
 	public static final int DLG_PROGRESS = 1;
+	static final int MENU_MAP = 100;
+	static final int MENU_NOTIFICATIONS = 101;
 	
 	
 	DepartureListAdapter adapter;
@@ -91,7 +97,7 @@
 		
 		
 		
-		findViewById(R.id.header).setOnClickListener( mapLauncher );
+		// findViewById(R.id.header).setOnClickListener( mapLauncher );
 		
 		int distance = station.getDistance();
 		if (distance != 0) {
@@ -119,11 +125,20 @@
 			} else {
 				departures = (DepartureBean) savedInstanceState.getSerializable("departures");
 				adapter.setDepartures(departures.entries);
-				selectedItemId = savedInstanceState.getInt("selectedItemId");	
+				selectedItemId = savedInstanceState.getInt("selectedItemId");
+				
+				if ( hasNotifications() ) {
+					findViewById(R.id.notifIcon).setVisibility(View.VISIBLE);
+				}
+				
 			}
 		}
 	}
 	
+	boolean hasNotifications() {
+		return (departures != null && departures.notifications.size() > 0);
+	}
+	
     @Override 
     public void onSaveInstanceState(Bundle outState) 
     {
@@ -187,6 +202,48 @@
 			return super.onCreateDialog(id);		
 		}
 	}
+	
+	
+
+
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		MenuItem item;
+		item = menu.add(0, MENU_MAP, 0, "Show on map");
+		item.setIcon(android.R.drawable.ic_menu_mapmode);
+		
+		item = menu.add(0, MENU_NOTIFICATIONS, 0, "Notifications");
+		item.setIcon(android.R.drawable.ic_menu_info_details);
+		
+		
+		boolean notifEnabled = hasNotifications();
+		item.setEnabled(notifEnabled);
+		
+
+		return true;
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {		
+		boolean res;
+		switch(item.getItemId()) {
+		case MENU_MAP:
+			Uri uri = Uri.parse("geo:" + station.getLatitude() + "," + station.getLongitude());
+			startActivity( new Intent(Intent.ACTION_VIEW, uri));
+			res = true;
+			break;
+		case MENU_NOTIFICATIONS:
+			Intent i = new Intent(this,dk.thoerup.traininfo.NotificationList.class);
+			i.putExtra(NotificationList.EXTRA_NOTIFICATIONS, departures.notifications);
+			startActivity(i);
+			res = true;
+			break;
+		default:
+			res = super.onOptionsItemSelected(item); 
+		}
+		return res;
+	}
 
 	void startDepartureFetcher() {
 		showDialog(DLG_PROGRESS);
@@ -208,13 +265,13 @@
 		}	
 	}
 	
-	View.OnClickListener mapLauncher = new View.OnClickListener() {
+	/*View.OnClickListener mapLauncher = new View.OnClickListener() {
 		@Override
 		public void onClick(View v) {			
 			Uri uri = Uri.parse("geo:" + station.getLatitude() + "," + station.getLongitude());
 			startActivity( new Intent(Intent.ACTION_VIEW, uri));
 		}
-	};
+	};*/
 
 
 	
@@ -234,6 +291,11 @@
 				adapter.setDepartures(departures.entries);
 				DepartureList.this.getListView().setVisibility(View.VISIBLE);
 				
+				
+				if ( hasNotifications() ) {
+					findViewById(R.id.notifIcon).setVisibility(View.VISIBLE);
+				}
+				
 				if (departures.entries.size() == 0) {
 					MessageBox.showMessage(DepartureList.this, "No departures found", true);
 				}