--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2011/05/03 12:35:34	1432
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2011/07/08 16:26:09	1562
@@ -11,12 +11,15 @@
 import android.app.Dialog;
 import android.app.ListActivity;
 import android.app.ProgressDialog;
+import android.content.ActivityNotFoundException;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.graphics.Typeface;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -27,6 +30,7 @@
 import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
+import android.widget.Toast;
 import dk.thoerup.android.traininfo.common.DepartureBean;
 import dk.thoerup.android.traininfo.common.DepartureEntry;
 import dk.thoerup.android.traininfo.common.MetroBean;
@@ -36,13 +40,15 @@
 import dk.thoerup.traininfo.provider.MetroProvider;
 import dk.thoerup.traininfo.provider.ProviderFactory;
 import dk.thoerup.traininfo.util.MessageBox;
+import dk.thoerup.traininfo.util.StationEntryCsv;
 
 public class DepartureList extends ListActivity {
 
 	public static final int DLG_PROGRESS = 1;
 	static final int MENU_MAP = 100;
 	static final int MENU_NOTIFICATIONS = 101;
-	static final int MENU_METROMAP= 102;
+	static final int MENU_METROMAP = 102;
+	static final int MENU_TOGGLEDETAILS= 103;
 	
 	
 	DepartureListAdapter adapter;
@@ -64,7 +70,7 @@
 	
 	String trainType = "REGIONAL";
 	
-	boolean arrival = false;
+	boolean arrival = false;	
 
 	int commFailCounter = 0;
 
@@ -75,7 +81,7 @@
 		
 		adapter = new DepartureListAdapter(this);
 		setListAdapter(adapter);
-		
+				
 		Intent launchedBy = getIntent();
 	
 		station = (StationEntry) launchedBy.getSerializableExtra("stationbean");
@@ -190,7 +196,9 @@
 	
 		ProviderFactory.purgeOldEntries(); //cleanup before fetching more data
 		
-		Log.e("Station", station.toCSV() );
+		Log.e("Station", StationEntryCsv.toCSV(station) );
+		
+		
 		
 		if (station.isMetro() == false) {
 			metroBtn.setVisibility( View.GONE );
@@ -220,6 +228,16 @@
 			trainType = "STOG";
 			
 		}
+		//Both enabled - use preferred from preferences
+		if (station.isRegional() == true && station.isStrain() == true ) {
+			SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+			trainType = prefs.getString("traintype", "REGIONAL"); //default value is gps	
+			
+			if (trainType.equals("STOG") ) {
+				stogBtn.setBackgroundResource(R.drawable.custom_button_hilight);
+				regionalBtn.setBackgroundResource(R.drawable.custom_button);
+			}
+		}
 				
 		
 		if (station.isRegional() == false && station.isStrain() == false) {
@@ -260,6 +278,8 @@
 		}
 	}
 	
+	
+	
 	boolean hasNotifications() {
 		return (departures != null && departures.notifications.size() > 0);
 	}
@@ -295,6 +315,12 @@
 	protected void onListItemClick(ListView l, View v, int position, long id) {
 		super.onListItemClick(l, v, position, id);
 		
+		//how can this happen ??
+		if (departures == null || departures.entries == null || departures.entries.size() == 0) {
+			Toast.makeText(this, "No departures in list ?!?", Toast.LENGTH_LONG).show(); //TODO: translate
+			return;
+		}
+		
 		selectedItemId = position;
 		
 		DepartureEntry dep = departures.entries.get(selectedItemId);
@@ -335,12 +361,25 @@
 	
 	
 
-
+	@Override
+	public boolean onPrepareOptionsMenu(Menu menu) {		
+		super.onPrepareOptionsMenu(menu);
+		
+		MenuItem item = menu.findItem( MENU_NOTIFICATIONS );
+		boolean notifEnabled = hasNotifications();
+		item.setEnabled(notifEnabled);
+		
+		return true;
+	}
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		MenuItem item;
 		
+		 
+		item = menu.add(0, MENU_TOGGLEDETAILS, 0, getString(R.string.departurelist_toggledetails));
+		item.setIcon(android.R.drawable.ic_menu_view);
+		
 		item = menu.add(0, MENU_MAP, 0, getString(R.string.departurelist_showonmap) );
 		item.setIcon(android.R.drawable.ic_menu_mapmode);
 		
@@ -353,36 +392,37 @@
 		if (station.isMetro()) {
 			item = menu.add(0, MENU_METROMAP, 0, "Metro" ); //TODO:translate!?!
 			item.setIcon(android.R.drawable.ic_menu_mapmode);			
-		}
-		
+		}						
 
 		return true;
 	}
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {		
-		boolean res;
+		boolean res = true;
 		switch(item.getItemId()) {
 		case MENU_MAP:
-			try {
-				Uri uri = Uri.parse("geo:" + station.getLatitude() + "," + station.getLongitude() + "?z=16");
+			Uri uri = Uri.parse("geo:" + station.getLatitude() + "," + station.getLongitude() + "?z=16");
+			
+			try {				
 				startActivity( new Intent(Intent.ACTION_VIEW, uri));
 			} catch (ActivityNotFoundException anfe) {
 				 Toast.makeText(this, "Could not launch google maps", Toast.LENGTH_LONG).show();
 			}
-			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;
+			startActivity(i);			
 			break;
 		case MENU_METROMAP:
 			Intent metroMap = new Intent(this,dk.thoerup.traininfo.MetroMap.class);
-			startActivity(metroMap);
-			res = true;
+			startActivity(metroMap);			
 			break;			
+		case MENU_TOGGLEDETAILS:
+			adapter.toggleShowDetails();						
+			break;
 		default:
 			res = super.onOptionsItemSelected(item); 
 		}
@@ -441,9 +481,9 @@
 				DepartureList.this.getListView().setVisibility(View.VISIBLE);
 				
 				
-				// handle notification icon.								
-				if ( hasNotifications() ) {
-					View notifIcon = findViewById(R.id.notifIcon);
+				// handle notification icon.
+				View notifIcon = findViewById(R.id.notifIcon);
+				if ( hasNotifications() ) {					
 					notifIcon.setVisibility(View.VISIBLE);
 					notifIcon.setClickable(true);
 					notifIcon.setOnClickListener( new View.OnClickListener() {						
@@ -454,7 +494,9 @@
 							startActivity(i);							
 						}
 					});
-				} 				
+				} else {
+					notifIcon.setVisibility(View.INVISIBLE);
+				}
 				
 				if (departures.entries.size() == 0) {
 					int msgId = (arrival==false) ? R.string.departurelist_nodepartures : R.string.departurelist_noarrivals;