From 8f1d535630d4d1541aafd1435a59bbfce8ed248a Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Fri, 16 Jul 2010 01:24:01 +0000
Subject: [PATCH] make it possible to get to global settings from the folder
 list

---
 res/menu/folder_list_option.xml          | 19 +++++++++++++++----
 src/com/fsck/k9/activity/FolderList.java | 10 ++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/res/menu/folder_list_option.xml b/res/menu/folder_list_option.xml
index eaa4eb381..0e77995b1 100644
--- a/res/menu/folder_list_option.xml
+++ b/res/menu/folder_list_option.xml
@@ -57,10 +57,21 @@
 		android:icon="@drawable/ic_menu_refresh"
 	/>
     <item
-		android:id="@+id/account_settings"
-		android:title="@string/account_settings_action"
-		android:icon="@android:drawable/ic_menu_preferences"
-	/>	
+        android:id="@+id/settings"
+        android:title="@string/preferences_action"
+        android:icon="@drawable/ic_menu_preferences">
+        <menu>
+        <item
+            android:id="@+id/account_settings"
+            android:title="@string/account_settings_action"
+            android:icon="@android:drawable/ic_menu_preferences"
+        />
+        <item android:id="@+id/app_settings"
+            android:title="@string/global_settings_action"
+            android:icon="@android:drawable/ic_menu_preferences"
+        />
+        </menu>
+    </item>
 	<item
 		android:id="@+id/send_messages"
 		android:title="@string/send_messages_action"
diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index 410f63511..f657dc283 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -20,6 +20,7 @@ import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;
 import com.fsck.k9.*;
 import com.fsck.k9.Account.FolderMode;
+import com.fsck.k9.activity.setup.Prefs;
 import com.fsck.k9.activity.setup.AccountSettings;
 import com.fsck.k9.activity.setup.FolderSettings;
 import com.fsck.k9.controller.MessagingController;
@@ -486,6 +487,10 @@ public class FolderList extends K9ListActivity
 
     }
 
+    private void onEditPrefs()
+    {
+        Prefs.actionPrefs(this);
+    }
     private void onEditAccount()
     {
         AccountSettings.actionSettings(this, mAccount);
@@ -556,6 +561,11 @@ public class FolderList extends K9ListActivity
 
                 return true;
 
+            case R.id.app_settings:
+                onEditPrefs();
+
+                return true;
+
             case R.id.empty_trash:
                 onEmptyTrash(mAccount);