--- android/Side9/src/dk/thoerup/side9/Side9WidgetProvider.java	2010/06/15 13:16:29	853
+++ android/Side9/src/dk/thoerup/side9/Side9WidgetProvider.java	2010/06/16 07:40:59	854
@@ -16,6 +16,7 @@
 import android.net.Uri;
 import android.os.Environment;
 import android.util.Log;
+import android.view.View;
 import android.widget.RemoteViews;
 import dk.thoerup.androidutils.HttpUtil;
 
@@ -48,7 +49,7 @@
 
 
 
-	private void setImage(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds, Bitmap image) {
+	private void setImage(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
 		// Perform this loop procedure for each App Widget that belongs to this provider
 		final int N = appWidgetIds.length; 
 		for (int i=0; i<N; i++) {
@@ -56,12 +57,19 @@
 
 			RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.side9widget);
 
-			if (image != null) {
-				views.setImageViewBitmap(R.id.side9picture, image);
+			if (usedBitmap != null) {
+				views.setImageViewBitmap(R.id.side9picture, usedBitmap);
 			} else {
 				views.setImageViewResource(R.id.side9picture, R.drawable.side9logo);
 			}
-			//views.setTextViewText(R.id.caption, newData.caption);
+			
+			boolean showcaption = context.getSharedPreferences(Side9WidgetProvider.TAG, Context.MODE_PRIVATE).getBoolean("showcaption", false);
+			
+			if (showcaption == true) {
+				views.setTextViewText(R.id.caption, " " + usedData.caption + " ");
+			} else {
+				views.setViewVisibility(R.id.caption, View.GONE);
+			}
 
 
 			//Intent viewIntent = new Intent(android.content.Intent.ACTION_VIEW, Uri.parse("http://www.ekstrabladet.dk/side9/"));			
@@ -124,7 +132,7 @@
 			Log.e("Side9Pigen", "update failed", e);
 		}
 
-		setImage(context,appWidgetManager,appWidgetIds, usedBitmap);
+		setImage(context,appWidgetManager,appWidgetIds);
 		Log.i("Side9Pigen", "update completed");
 	}