--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2010/10/01 17:57:02	1152
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2011/04/05 05:31:32	1262
@@ -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();
@@ -368,12 +437,24 @@
 				DepartureList.this.getListView().setVisibility(View.VISIBLE);
 				
 				
+				// handle notification icon.								
 				if ( hasNotifications() ) {
-					findViewById(R.id.notifIcon).setVisibility(View.VISIBLE);
-				}
+					View notifIcon = findViewById(R.id.notifIcon);
+					notifIcon.setVisibility(View.VISIBLE);
+					notifIcon.setClickable(true);
+					notifIcon.setOnClickListener( new View.OnClickListener() {						
+						@Override
+						public void onClick(View v) {
+							Intent i = new Intent(DepartureList.this, dk.thoerup.traininfo.NotificationList.class);
+							i.putExtra(NotificationList.EXTRA_NOTIFICATIONS, departures.notifications);
+							startActivity(i);							
+						}
+					});
+				} 				
 				
-				if (departures.entries.size() == 0) {
-					MessageBox.showMessage(DepartureList.this, "No departures found", true);
+				if (departures.entries.size() != 0) {
+					int msgId = (arrival==false) ? R.string.departurelist_nodepartures : R.string.departurelist_noarrivals; 
+					MessageBox.showMessage(DepartureList.this, getString(msgId), false);
 				}
 			} else { // communication or parse error
 				commFailCounter++;
@@ -406,7 +487,7 @@
 
 		@Override
 		protected Void doInBackground(Integer... params) {
-			departures = provider.lookupDepartures(params[0], DepartureList.this.arrival);
+			departures = provider.lookupDepartures(params[0], DepartureList.this.arrival, trainType);
 			return null;
 		}