moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-16 06:25:06 -05:00
Code Issues Releases Wiki Activity

"Deselect all" -> "Unselect all" (at a code level)

Browse Source 
"Deslect all" -> "Done" (at a UI level)
This commit is contained in:
Jesse Vincent 2010-01-19 00:51:02 +00:00
parent ae029762cf
commit a145d3c616
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/menu/message_list_option.xml
View File

@ -85,8 +85,8 @@
android:title="@string/batch_select_all" android:title="@string/batch_select_all"
/> />
<item <item
android:id="@+id/batch_deselect_all" android:id="@+id/batch_unselect_all"
android:title="@string/batch_deselect_all" android:title="@string/batch_unselect_all"
/> />
</menu> </menu>
</item> </item>

2
res/values/strings.xml
View File

@ -629,7 +629,7 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin
<string name="batch_select_mode">Select mode</string> <string name="batch_select_mode">Select mode</string>
<string name="batch_plain_mode">Plain mode</string> <string name="batch_plain_mode">Plain mode</string>
<string name="batch_select_all">Select all</string> <string name="batch_select_all">Select all</string>
<string name="batch_deselect_all">Deselect all</string> <string name="batch_unselect_all">Done</string>
<string name="account_setup_push_limit_label">Max folders to check with push</string> <string name="account_setup_push_limit_label">Max folders to check with push</string>
<string name="account_setup_push_limit_10">10 folders</string> <string name="account_setup_push_limit_10">10 folders</string>

6
src/com/fsck/k9/activity/MessageList.java
View File

@ -1114,7 +1114,7 @@ public class MessageList
toggleBatchButtons(); toggleBatchButtons();
return true; return true;
case R.id.batch_deselect_all: case R.id.batch_unselect_all:
setAllSelected(false); setAllSelected(false);
toggleBatchButtons(); toggleBatchButtons();
return true; return true;
@ -1161,7 +1161,7 @@ public class MessageList
private final int[] batch_ops = { R.id.batch_copy_op, R.id.batch_delete_op, R.id.batch_flag_op, private final int[] batch_ops = { R.id.batch_copy_op, R.id.batch_delete_op, R.id.batch_flag_op,
R.id.batch_unflag_op, R.id.batch_mark_read_op, R.id.batch_mark_unread_op, R.id.batch_move_op , R.id.batch_unflag_op, R.id.batch_mark_read_op, R.id.batch_mark_unread_op, R.id.batch_move_op ,
R.id.batch_select_all, R.id.batch_deselect_all R.id.batch_select_all, R.id.batch_unselect_all
}; };
@ -1198,7 +1198,7 @@ public class MessageList
menu.findItem(R.id.batch_unflag_op).setVisible(!newFlagState); menu.findItem(R.id.batch_unflag_op).setVisible(!newFlagState);
menu.findItem(R.id.batch_mark_read_op).setVisible(newReadState); menu.findItem(R.id.batch_mark_read_op).setVisible(newReadState);
menu.findItem(R.id.batch_mark_unread_op).setVisible(!newReadState); menu.findItem(R.id.batch_mark_unread_op).setVisible(!newReadState);
menu.findItem(R.id.batch_deselect_all).setEnabled(anySelected); menu.findItem(R.id.batch_unselect_all).setVisible(anySelected);
menu.findItem(R.id.batch_select_all).setEnabled(true); menu.findItem(R.id.batch_select_all).setEnabled(true);
// TODO: batch move and copy not yet implemented // TODO: batch move and copy not yet implemented
menu.findItem(R.id.batch_move_op).setVisible(false); menu.findItem(R.id.batch_move_op).setVisible(false);