--- android/Side9/src/dk/thoerup/side9/PictureOverview.java	2010/11/02 13:53:49	1184
+++ android/Side9/src/dk/thoerup/side9/PictureOverview.java	2010/11/02 17:08:57	1185
@@ -4,12 +4,18 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.GridView;
 import android.widget.AdapterView.OnItemClickListener;
 
 public class PictureOverview extends Activity {
+	final static int MENU_DATE = 0;
+	final static int MENU_CAPTION = 1;
+	
+	int current_order = MENU_DATE;
 	
 	ImageAdapter mImages;
 	
@@ -27,15 +33,60 @@
 	        public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
 	        	
 	        	Intent i = new Intent(PictureOverview.this, dk.thoerup.side9.PictureView.class);
-	        	i.putExtra("files", mImages.getImagePaths());
+	        	i.putExtra("images", mImages.getImages());
 	        	i.putExtra("index", position);
 
 	        	startActivity(i);
 	        }
 	    });
 	    
+	    
 	    CheckUpdates update = new CheckUpdates();
 	    update.checkForUpdates(this, "http://t-hoerup.dk/android/side9/version.txt", "Side 9 Pigen", "http://t-hoerup.dk/android/side9/Side9.apk");
+	}
+
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		menu.add(0,MENU_DATE,0, "Order by date");		
+		menu.add(0,MENU_CAPTION,0, "Order by caption");
 
+		return true;
 	}
+	
+	
+
+	@Override
+	public boolean onPrepareOptionsMenu(Menu menu) {
+		MenuItem item = menu.findItem(MENU_DATE);
+		if (current_order == MENU_DATE) 
+			item.setEnabled(false);
+		else
+			item.setEnabled(true);
+		
+		item = menu.findItem(MENU_CAPTION);
+		if (current_order == MENU_CAPTION) 
+			item.setEnabled(false);
+		else
+			item.setEnabled(true);
+
+		return true;
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch( item.getItemId() ) {
+		case MENU_DATE:
+			mImages.orderByPath();
+			current_order = MENU_DATE;
+			return true;
+		case MENU_CAPTION:
+			mImages.orderByCaption();
+			current_order = MENU_CAPTION;
+			return true;
+		default:
+			return super.onOptionsItemSelected(item);
+		}		
+	}
+	
+	
 }