--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2011/03/31 17:39:20	1249
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2011/03/31 18:20:42	1250
@@ -62,6 +62,8 @@
 
 	StationEntry station;
 	
+	String trainType = "REGIONAL";
+	
 	boolean arrival = false;
 
 	int commFailCounter = 0;
@@ -86,6 +88,8 @@
 		final Button departureBtn = (Button) findViewById(R.id.departurebtn);
 		final Button arrivalBtn = (Button) findViewById(R.id.arrivalbtn);
 		final Button metroBtn = (Button) findViewById(R.id.metrobtn);
+		final Button regionalBtn = (Button) findViewById(R.id.regionalbtn);
+		final Button stogBtn = (Button) findViewById(R.id.stogbtn);
 		
 		final View metroView = findViewById(R.id.metroonly);
 		
@@ -116,13 +120,52 @@
 			}
 		});
 		
+		regionalBtn.setOnClickListener( new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {	
+				regionalBtn.setBackgroundResource(R.drawable.custom_button_hilight);
+				stogBtn.setBackgroundResource(R.drawable.custom_button);				
+				metroBtn.setBackgroundResource(R.drawable.custom_button);
+				
+				departureBtn.setVisibility( View.VISIBLE );
+				arrivalBtn.setVisibility( View.VISIBLE );
+				
+				getListView().setVisibility( View.VISIBLE );		
+				metroView.setVisibility( View.GONE );
+				trainType = "REGIONAL";
+				startDepartureFetcher();
+			}
+		});
+		stogBtn.setOnClickListener( new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {	
+				regionalBtn.setBackgroundResource(R.drawable.custom_button);
+				stogBtn.setBackgroundResource(R.drawable.custom_button_hilight);				
+				metroBtn.setBackgroundResource(R.drawable.custom_button);
+
+
+				departureBtn.setVisibility( View.VISIBLE );
+				arrivalBtn.setVisibility( View.VISIBLE );
+				
+				getListView().setVisibility( View.VISIBLE );		
+				metroView.setVisibility( View.GONE );
+				trainType = "STOG";			
+				startDepartureFetcher();
+			}
+		});
+
+		
+		
 		metroBtn.setOnClickListener( new OnClickListener() {			
 			@Override
 			public void onClick(View v) {
-				arrivalBtn.setBackgroundResource(R.drawable.custom_button);
-				departureBtn.setBackgroundResource(R.drawable.custom_button);
+				regionalBtn.setBackgroundResource(R.drawable.custom_button);
+				stogBtn.setBackgroundResource(R.drawable.custom_button);				
 				metroBtn.setBackgroundResource(R.drawable.custom_button_hilight);
 				
+				departureBtn.setVisibility( View.GONE );
+				arrivalBtn.setVisibility( View.GONE );
+				
 				getListView().setVisibility( View.GONE );		
 				metroView.setVisibility( View.VISIBLE );
 				startMetroFetcher();
@@ -155,13 +198,39 @@
 	
 		metro = ProviderFactory.getMetroProvider();
 		
+		if (station.isRegional() == false ) {
+			regionalBtn.setVisibility(View.GONE);
+		}
+		
+		if (station.isStrain() == false ) {
+			stogBtn.setVisibility(View.GONE);
+		}
+		
+		if (station.isRegional() == true && station.isStrain() == false ) {
+			if ( station.isMetro() == false ) 
+				regionalBtn.setVisibility(View.GONE);
+			trainType = "REGIONAL";			
+		}		
+
+		if (station.isRegional() == false  && station.isStrain() == true) {
+			if (station.isMetro() == false)
+				stogBtn.setVisibility(View.GONE);
+
+			stogBtn.setBackgroundResource(R.drawable.custom_button_hilight);
+			trainType = "STOG";
+			
+		}
+				
+		
 		if (station.isRegional() == false && station.isStrain() == false) {
 			getListView().setVisibility( View.GONE );		
 			metroView.setVisibility( View.VISIBLE );
 			
 			departureBtn.setVisibility( View.GONE );
 			arrivalBtn.setVisibility(View.GONE);
-			metroBtn.setVisibility( View.GONE );
+			metroBtn.setVisibility( View.GONE );		
+			
+			
 			
 			if (savedInstanceState == null) {
 				startMetroFetcher();
@@ -406,7 +475,7 @@
 
 		@Override
 		protected Void doInBackground(Integer... params) {
-			departures = provider.lookupDepartures(params[0], DepartureList.this.arrival, "BOTH");
+			departures = provider.lookupDepartures(params[0], DepartureList.this.arrival, trainType);
 			return null;
 		}