3 files changed, 53 insertions, 24 deletions

diff --git a/src/de/podfetcher/activity/PodfetcherActivity.java b/src/de/podfetcher/activity/PodfetcherActivity.java
index b9cb3883f..441e8aa31 100644
--- a/src/de/podfetcher/activity/PodfetcherActivity.java
+++ b/src/de/podfetcher/activity/PodfetcherActivity.java
@@ -1,15 +1,23 @@
 package de.podfetcher.activity;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.ActionBar.Tab;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
 
 import de.podfetcher.R;
+import de.podfetcher.feed.FeedManager;
 import de.podfetcher.fragment.FeedItemlistFragment;
 import de.podfetcher.fragment.FeedlistFragment;
 import de.podfetcher.fragment.UnreadItemlistFragment;
@@ -17,6 +25,8 @@ import de.podfetcher.fragment.UnreadItemlistFragment;
 public class PodfetcherActivity extends SherlockFragmentActivity {
 	private static final String TAG = "PodfetcherActivity";
 
+	private FeedManager manager;
+	
 	private FeedlistFragment feedlist;
 	FeedItemlistFragment unreadList;
 	
@@ -24,6 +34,7 @@ public class PodfetcherActivity extends SherlockFragmentActivity {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
+		manager = FeedManager.getInstance();
 		setContentView(R.layout.main);
 		// Set up tabs
 		ActionBar actionBar = getSupportActionBar();
@@ -49,6 +60,33 @@ public class PodfetcherActivity extends SherlockFragmentActivity {
 								UnreadItemlistFragment.class));
 		actionBar.addTab(tab);
 	}
+	
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+	    switch(item.getItemId()) {
+	        case R.id.add_feed:
+	            startActivity(new Intent(this, AddFeedActivity.class));
+				return true;
+			case R.id.all_feed_refresh:
+				manager.refreshAllFeeds(this);
+				return true;
+            case R.id.show_downloads:
+                startActivity(new Intent(this, DownloadActivity.class));
+                return true;
+            case R.id.show_preferences:
+            	startActivity(new Intent(this, PreferenceActivity.class));
+            	return true;
+			default:
+			    return super.onOptionsItemSelected(item);
+	    }
+	}
+	
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		MenuInflater inflater = new MenuInflater(this);
+	    inflater.inflate(R.menu.podfetcher, menu);
+	    return true;
+	}
 
 	/** TabListener for navigating between the main lists. */
 	private class TabListener<T extends Fragment> implements
diff --git a/src/de/podfetcher/activity/PreferenceActivity.java b/src/de/podfetcher/activity/PreferenceActivity.java
new file mode 100644
index 000000000..8701474ee
--- /dev/null
+++ b/src/de/podfetcher/activity/PreferenceActivity.java
@@ -0,0 +1,15 @@
+package de.podfetcher.activity;
+
+import android.os.Bundle;
+
+import com.actionbarsherlock.app.SherlockPreferenceActivity;
+
+import de.podfetcher.R;
+
+public class PreferenceActivity extends SherlockPreferenceActivity {
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		addPreferencesFromResource(R.xml.preferences);
+	}
+}
diff --git a/src/de/podfetcher/fragment/FeedlistFragment.java b/src/de/podfetcher/fragment/FeedlistFragment.java
index b922b9bbb..73e86c881 100644
--- a/src/de/podfetcher/fragment/FeedlistFragment.java
+++ b/src/de/podfetcher/fragment/FeedlistFragment.java
@@ -47,42 +47,18 @@ public class FeedlistFragment extends SherlockListFragment {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		setHasOptionsMenu(true);
 		Log.d(TAG, "Creating");	
 		manager = FeedManager.getInstance();
 		fla = new FeedlistAdapter(pActivity, 0, manager.getFeeds());
 		setListAdapter(fla);
 
 	}
-
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 			Bundle savedInstanceState) {
 		super.onCreateView(inflater, container, savedInstanceState);
 		return inflater.inflate(R.layout.feedlist, container, false);
 	}
-	
-	@Override
-	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-	    inflater.inflate(R.menu.feedlist, menu);
-	}
-	
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-	    switch(item.getItemId()) {
-	        case R.id.add_feed:
-	            startActivity(new Intent(pActivity, AddFeedActivity.class));
-				return true;
-			case R.id.all_feed_refresh:
-				manager.refreshAllFeeds(pActivity);
-				return true;
-            case R.id.show_downloads:
-                startActivity(new Intent(pActivity, DownloadActivity.class));
-                return true;
-			default:
-			    return super.onOptionsItemSelected(item);
-	    }
-	}
 
 	@Override
 	public void onResume() {