From a59ade4fdd65a6254c1a877a7dd2ed963f9833ea Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Sat, 15 May 2010 21:03:44 +0000
Subject: [PATCH] When no messages are selected yet, "Select all" is the only
 valid batch option. Instead of forcing the user through a submenu, show
 "Select all" instead of the submenu

---
 res/drawable/ic_menu_select_all.png       | Bin 0 -> 1470 bytes
 res/menu/message_list_option.xml          |   4 ++++
 src/com/fsck/k9/activity/MessageList.java |   5 +++++
 3 files changed, 9 insertions(+)
 create mode 100644 res/drawable/ic_menu_select_all.png

diff --git a/res/drawable/ic_menu_select_all.png b/res/drawable/ic_menu_select_all.png
new file mode 100644
index 0000000000000000000000000000000000000000..be2ced1e1c5c92df1725e08511df1ef5fb950402
GIT binary patch
literal 1470
zcmV;v1ws0WP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igS>
z6#xMBA8S+q00lltL_t(&-tC!RNLyDN$G_*#z2@G=m>8pJl3HhL#Xk%R9fg3<y><_S
z6-(2HQdU?613nJM#$YQxtPhqlI=0m@Si8MgVH>!1lZHJw&<tB!U)DgV5G5vsjA>%-
zP3}E==#6uorrLIzP=7D?;r`COzwbHUbI*t01$JXMUhW`IOAtbkP2>pxAcTmD5g>%1
z02lxX0Jn0<2E`iyiU0}#%<UAy%gj0lpxnB3D-est+BoNo5JH~F6NX`!0CN5P{nG%l
z05nU`&aHqo`^wPJP){@({ee;{5kl}p{SZQ|UTbP<#)gN7&j47mR)V~s8q3;~ml4Jp
zW6gm;Kyo-7;QZgIvMfVYRS-f_xm>O>olYMDPy--e8gE&UK1boEH5o-Agt49oUgiOe
zbIxR0hN38tW%-{QjKOZVqq(^`BT3Tx_wL>M!r^d~o+sVBdDC_O{{2@~RjuKivuCN^
zG)+^}w1T22iSy^r|FMxZ`DQG}7z1OE>mY<cQ55)mJ{&uCEE$PJRx+7P={^M@-MMq;
z=*-N_2xII&w%bY=hJo7J+V24LTPv|O0fu3qSS$hnR8@UEfO8N+%wRA`0mLUJCSF-s
zSb*2-Ee)gf_4TsP=Y!pD2c`761n|e+l{VT_PZc190HqYIt*y&VO-+3>Gc#Xzc6M@A
zRX+)b!!4;)>La(?y($y{3WWlS#UcnHt1I`c@w5pjE1*~`3Qg0H$z=4##zuR4dwXv#
zmt!3r9iI*i3^XQ_$&+rk8+CPcFimsSzKk*5=kuYdsp+`{XqtvxE>}8V#FhmJA)xCz
z5{ZO-;lc$RKYskp)2B~I1_uY{5{bk`m&=8^x;k*qO9BLdLU(uf<fBKA-f+9!&%B9+
z5N1A~FX+0Sur{!{RRO{<3;_Thj|WRjOSp041|}yblXG)(AK2}7I2;a0k_5(B$wCHz
zLQhXm8o;kF@-w<s0Rli#lB9fneLb8`Cp;bx8X6jq&*wvJZEbKk98eSmr7ul3o7Dm6
z*2{G3#XEM82>`~aQ>P;1<KtJHPUpUomrc`zVHlv4uKHWob;D+}eftCpZ3_>PGAv{R
z;Fy}4YK_HWha^doHeewGz;Y-Q`W-+9K$Z|vz&1rW7E&)=y3{i@HTC^wSjc9x{dD!}
z)iVJ8suUJtl+t}$V4*eu@|r`Z@>yulo;^Q%z21?kWFc9We>-vF#CwrQq@(IsNYk{`
zkt0Vw1R$!0g%m{@?ds~fK07=6jV#NbA3S(46Ap*pO{G#NE1res=jW4lyZx8$?(Vs0
zG<q=<3jH`RFc7X97RqL`-rKite|Goo-LEcRzI<hHaPaj+B5}6rSZIEJ{_VcLKAKD>
z->PO7I$K*?yURlVYhTC;$?x~eEiEk*4<0-?YOxUAfQ9}%ckWz#yNcc{3pET44ZRbM
zMn9&MViSF#^ziU-XC<*v4P&f55D1_g3ke~R&*za&r=69?LNe!^mt!Hn-;c$`MF2om
z_Js}~K8&%kF;pE30YESq#Ny&278VweNF*wsh4$~?k7P0lN-4U!x-dICi;<BLJbd^N
z)zBBh-o1O__xrKDyo{BV6^xFKA|8*UTKYn;`a%c>gSd9>8e*{+DxHPQ_4-27)6<B@
z<4{$#;#nv!Nm6bd7Q%r82i9XDv(i{d>+S9Ra(sOJHJ8ifS<6DEX@XL^y1{f^7qTp0
zw|;IIJKh(vJjkq*)n<LhSUGaFe5wH`5<<)!WuZ0AEn<0?mdO=s{A%vRuh!kzjh8w8
Y22ae3@>h($l>h($07*qoM6N<$g6X!Fz5oCK

literal 0
HcmV?d00001

diff --git a/res/menu/message_list_option.xml b/res/menu/message_list_option.xml
index 8ee5192b7..415af52e0 100644
--- a/res/menu/message_list_option.xml
+++ b/res/menu/message_list_option.xml
@@ -37,6 +37,10 @@
 			/>
 		</menu>
 	</item>
+	<item
+        android:id="@+id/select_all"
+		android:title="@string/batch_select_all"
+        android:icon="@drawable/ic_menu_select_all"/>
 	<item
 		android:id="@+id/batch_ops"
 		android:title="@string/batch_ops"
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 8acba2c4e..98bc6bf56 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -1153,6 +1153,7 @@ public class MessageList
 
                 return true;
 
+            case R.id.select_all:
             case R.id.batch_select_all:
                 setAllSelected(true);
                 toggleBatchButtons();
@@ -1271,6 +1272,10 @@ public class MessageList
     public boolean onPrepareOptionsMenu(Menu menu)
     {
         boolean anySelected = anySelected();
+
+        menu.findItem(R.id.select_all).setVisible(! anySelected);
+        menu.findItem(R.id.batch_ops).setVisible(anySelected);
+
         setOpsState(menu, true, anySelected);
 
         if (mQueryString != null)