moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

unselect->deselect

This commit is contained in:
Jesse Vincent 2010-01-19 02:58:17 +00:00
parent 2c406a58b0
commit c5fa25151a
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/menu/message_list_context.xml
View File

@ -9,9 +9,9 @@
android:title="@string/select_action"
/>
<item
android:id="@+id/unselect"
android:id="@+id/deselect"
android:visible="false"
android:title="@string/unselect_action"
android:title="@string/deselect_action"
/>
<item
android:id="@+id/delete"

4
res/menu/message_list_option.xml
View File

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

4
res/values/strings.xml
View File

@ -36,7 +36,7 @@
<string name="cancel_action">Cancel</string>
<string name="send_action">Send</string>
<string name="select_action">Select</string>
<string name="unselect_action">Unselect</string>
<string name="deselect_action">Unselect</string>
<string name="reply_action">Reply</string>
<string name="reply_all_action">Reply all</string>
<string name="delete_action">Delete</string>
@ -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_plain_mode">Plain mode</string>
<string name="batch_select_all">Select all</string>
<string name="batch_unselect_all">Done</string>
<string name="batch_deselect_all">Done</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>

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

@ -1114,7 +1114,7 @@ public class MessageList
toggleBatchButtons();
return true;
case R.id.batch_unselect_all:
case R.id.batch_deselect_all:
setAllSelected(false);
toggleBatchButtons();
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,
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_unselect_all
R.id.batch_select_all, R.id.batch_deselect_all
};
@ -1198,7 +1198,7 @@ public class MessageList
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_unread_op).setVisible(!newReadState);
menu.findItem(R.id.batch_unselect_all).setVisible(anySelected);
menu.findItem(R.id.batch_deselect_all).setVisible(anySelected);
menu.findItem(R.id.batch_select_all).setEnabled(true);
// TODO: batch move and copy not yet implemented
menu.findItem(R.id.batch_move_op).setVisible(false);
@ -1248,7 +1248,7 @@ public class MessageList
setSelected(holder, true);
break;
case R.id.unselect:
case R.id.deselect:
setSelected(holder, false);
break;
@ -1397,12 +1397,12 @@ public class MessageList
if (message.selected)
{
menu.findItem(R.id.select).setVisible(false);
menu.findItem(R.id.unselect).setVisible(true);
menu.findItem(R.id.deselect).setVisible(true);
}
else
{
menu.findItem(R.id.select).setVisible(true);
menu.findItem(R.id.unselect).setVisible(false);
menu.findItem(R.id.deselect).setVisible(false);
}
}