From af1b9f83f2945cb85f2c6e4d464d3839a0b26eb7 Mon Sep 17 00:00:00 2001 From: Mark Baker Date: Sat, 24 Dec 2011 18:17:12 +0000 Subject: [PATCH 01/91] Added batch buttons for Archive and Move. Made batch buttons configurable. --- res/drawable/ic_button_archive.png | Bin 0 -> 4113 bytes res/layout/message_list_batch_buttons.xml | 14 ++++ res/values/strings.xml | 9 +++ res/xml/global_preferences.xml | 45 ++++++++++++ src/com/fsck/k9/K9.java | 64 +++++++++++++++++- src/com/fsck/k9/activity/MessageList.java | 30 +++++++- src/com/fsck/k9/activity/setup/Prefs.java | 32 ++++++++- .../fsck/k9/preferences/GlobalSettings.java | 18 +++++ 8 files changed, 207 insertions(+), 5 deletions(-) create mode 100644 res/drawable/ic_button_archive.png diff --git a/res/drawable/ic_button_archive.png b/res/drawable/ic_button_archive.png new file mode 100644 index 0000000000000000000000000000000000000000..f7fbd5f6dbf254b5ac4425a523f55ff73ef7e65b GIT binary patch literal 4113 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 + + Lock-screen notifications Don\'t display message subject in notification bar when system is locked + Batch buttons + Configure message list batch buttons + Mark read/unread + Delete + Move to archive + Move + Flag + Unselect + Quiet Time Disable ringing, buzzing and flashing at night Quiet Time starts diff --git a/res/xml/global_preferences.xml b/res/xml/global_preferences.xml index 58c41afdf..02fa3c9a7 100644 --- a/res/xml/global_preferences.xml +++ b/res/xml/global_preferences.xml @@ -157,6 +157,7 @@ android:dependency="messagelist_show_contact_name" /> + + + + + + + + + + + + + + + + + + selection = getSelectionFromCheckboxes(); + onArchive(selection); + return; + } + + if (v == mBatchMoveButton) { + final List selection = getSelectionFromCheckboxes(); + onMove(selection); + return; + } + synchronized (mAdapter.messages) { for (MessageInfoHolder holder : mAdapter.messages) { if (holder.selected) { @@ -2546,6 +2568,8 @@ public class MessageList holder.flagged = newState; } else if (v == mBatchReadButton) { holder.read = newState; + } else if (v == mBatchArchiveButton) { + // TODO } messageList.add(holder.message); } diff --git a/src/com/fsck/k9/activity/setup/Prefs.java b/src/com/fsck/k9/activity/setup/Prefs.java index 7a436c65e..540df2f9c 100644 --- a/src/com/fsck/k9/activity/setup/Prefs.java +++ b/src/com/fsck/k9/activity/setup/Prefs.java @@ -74,7 +74,12 @@ public class Prefs extends K9PreferenceActivity { private static final String PREFERENCE_QUIET_TIME_ENABLED = "quiet_time_enabled"; private static final String PREFERENCE_QUIET_TIME_STARTS = "quiet_time_starts"; private static final String PREFERENCE_QUIET_TIME_ENDS = "quiet_time_ends"; - + private static final String PREFERENCE_BATCH_BUTTONS_MARK_READ = "batch_buttons_mark_read"; + private static final String PREFERENCE_BATCH_BUTTONS_DELETE = "batch_buttons_delete"; + private static final String PREFERENCE_BATCH_BUTTONS_ARCHIVE = "batch_buttons_archive"; + private static final String PREFERENCE_BATCH_BUTTONS_MOVE = "batch_buttons_move"; + private static final String PREFERENCE_BATCH_BUTTONS_FLAG = "batch_buttons_flag"; + private static final String PREFERENCE_BATCH_BUTTONS_UNSELECT = "batch_buttons_unselect"; private static final String PREFERENCE_MESSAGEVIEW_MOBILE_LAYOUT = "messageview_mobile_layout"; private static final String PREFERENCE_BACKGROUND_OPS = "background_ops"; @@ -121,6 +126,12 @@ public class Prefs extends K9PreferenceActivity { private com.fsck.k9.preferences.TimePickerPreference mQuietTimeEnds; private Preference mAttachmentPathPreference; + private CheckBoxPreference mBatchButtonsMarkRead; + private CheckBoxPreference mBatchButtonsDelete; + private CheckBoxPreference mBatchButtonsArchive; + private CheckBoxPreference mBatchButtonsMove; + private CheckBoxPreference mBatchButtonsFlag; + private CheckBoxPreference mBatchButtonsUnselect; public static void actionPrefs(Context context) { Intent i = new Intent(context, Prefs.class); @@ -342,6 +353,19 @@ public class Prefs extends K9PreferenceActivity { } }; }); + + mBatchButtonsMarkRead = (CheckBoxPreference)findPreference(PREFERENCE_BATCH_BUTTONS_MARK_READ); + mBatchButtonsDelete = (CheckBoxPreference)findPreference(PREFERENCE_BATCH_BUTTONS_DELETE); + mBatchButtonsArchive = (CheckBoxPreference)findPreference(PREFERENCE_BATCH_BUTTONS_ARCHIVE); + mBatchButtonsMove = (CheckBoxPreference)findPreference(PREFERENCE_BATCH_BUTTONS_MOVE); + mBatchButtonsFlag = (CheckBoxPreference)findPreference(PREFERENCE_BATCH_BUTTONS_FLAG); + mBatchButtonsUnselect = (CheckBoxPreference)findPreference(PREFERENCE_BATCH_BUTTONS_UNSELECT); + mBatchButtonsMarkRead.setChecked(K9.batchButtonsMarkRead()); + mBatchButtonsDelete.setChecked(K9.batchButtonsDelete()); + mBatchButtonsArchive.setChecked(K9.batchButtonsArchive()); + mBatchButtonsMove.setChecked(K9.batchButtonsMove()); + mBatchButtonsFlag.setChecked(K9.batchButtonsFlag()); + mBatchButtonsUnselect.setChecked(K9.batchButtonsUnselect()); } private void saveSettings() { @@ -380,6 +404,12 @@ public class Prefs extends K9PreferenceActivity { K9.setQuietTimeStarts(mQuietTimeStarts.getTime()); K9.setQuietTimeEnds(mQuietTimeEnds.getTime()); + K9.setBatchButtonsMarkRead(mBatchButtonsMarkRead.isChecked()); + K9.setBatchButtonsDelete(mBatchButtonsDelete.isChecked()); + K9.setBatchButtonsArchive(mBatchButtonsArchive.isChecked()); + K9.setBatchButtonsMove(mBatchButtonsMove.isChecked()); + K9.setBatchButtonsFlag(mBatchButtonsFlag.isChecked()); + K9.setBatchButtonsUnselect(mBatchButtonsUnselect.isChecked()); K9.setZoomControlsEnabled(mZoomControlsEnabled.isChecked()); K9.setAttachmentDefaultPath(mAttachmentPathPreference.getSummary().toString()); diff --git a/src/com/fsck/k9/preferences/GlobalSettings.java b/src/com/fsck/k9/preferences/GlobalSettings.java index 5dcae70bb..d09e93417 100644 --- a/src/com/fsck/k9/preferences/GlobalSettings.java +++ b/src/com/fsck/k9/preferences/GlobalSettings.java @@ -191,6 +191,24 @@ public class GlobalSettings { s.put("zoomControlsEnabled", Settings.versions( new V(1, new BooleanSetting(false)) )); + s.put("batchButtonsMarkRead", Settings.versions( + new V(1, new BooleanSetting(true)) + )); + s.put("batchButtonsDelete", Settings.versions( + new V(1, new BooleanSetting(true)) + )); + s.put("batchButtonsArchive", Settings.versions( + new V(1, new BooleanSetting(false)) + )); + s.put("batchButtonsMove", Settings.versions( + new V(1, new BooleanSetting(false)) + )); + s.put("batchButtonsFlag", Settings.versions( + new V(1, new BooleanSetting(true)) + )); + s.put("batchButtonsUnselect", Settings.versions( + new V(1, new BooleanSetting(true)) + )); SETTINGS = Collections.unmodifiableMap(s); From a8c6ec45d2221ac18da004db85c2976d13bb29fc Mon Sep 17 00:00:00 2001 From: Mark Baker Date: Mon, 26 Dec 2011 19:15:35 +0000 Subject: [PATCH 02/91] Replaced archive icon. Still a bit crap, but better than my previous attempt. --- res/drawable/ic_button_archive.png | Bin 4113 -> 4166 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/res/drawable/ic_button_archive.png b/res/drawable/ic_button_archive.png index f7fbd5f6dbf254b5ac4425a523f55ff73ef7e65b..4a410a3c4d60c278f971f869cda0853dfbc94adc 100644 GIT binary patch delta 1463 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 Date: Thu, 29 Dec 2011 09:56:54 +0000 Subject: [PATCH 03/91] Remove TODO --- src/com/fsck/k9/activity/MessageList.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java index 73e81cacc..d7bbc4dd3 100644 --- a/src/com/fsck/k9/activity/MessageList.java +++ b/src/com/fsck/k9/activity/MessageList.java @@ -2568,8 +2568,6 @@ public class MessageList holder.flagged = newState; } else if (v == mBatchReadButton) { holder.read = newState; - } else if (v == mBatchArchiveButton) { - // TODO } messageList.add(holder.message); } From 0e86fb2a800a059b2fbe590ccd4e9e26748211ee Mon Sep 17 00:00:00 2001 From: Mark Baker Date: Wed, 4 Jan 2012 19:58:19 +0000 Subject: [PATCH 04/91] Fixed whitespace --- res/values/strings.xml | 16 ++++++++-------- src/com/fsck/k9/activity/setup/Prefs.java | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 354f913fd..fa2d47dd5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -352,14 +352,14 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin Lock-screen notifications Don\'t display message subject in notification bar when system is locked - Batch buttons - Configure message list batch buttons - Mark read/unread - Delete - Move to archive - Move - Flag - Unselect + Batch buttons + Configure message list batch buttons + Mark read/unread + Delete + Move to archive + Move + Flag + Unselect Quiet Time Disable ringing, buzzing and flashing at night diff --git a/src/com/fsck/k9/activity/setup/Prefs.java b/src/com/fsck/k9/activity/setup/Prefs.java index 540df2f9c..5294d1838 100644 --- a/src/com/fsck/k9/activity/setup/Prefs.java +++ b/src/com/fsck/k9/activity/setup/Prefs.java @@ -76,10 +76,10 @@ public class Prefs extends K9PreferenceActivity { private static final String PREFERENCE_QUIET_TIME_ENDS = "quiet_time_ends"; private static final String PREFERENCE_BATCH_BUTTONS_MARK_READ = "batch_buttons_mark_read"; private static final String PREFERENCE_BATCH_BUTTONS_DELETE = "batch_buttons_delete"; - private static final String PREFERENCE_BATCH_BUTTONS_ARCHIVE = "batch_buttons_archive"; - private static final String PREFERENCE_BATCH_BUTTONS_MOVE = "batch_buttons_move"; - private static final String PREFERENCE_BATCH_BUTTONS_FLAG = "batch_buttons_flag"; - private static final String PREFERENCE_BATCH_BUTTONS_UNSELECT = "batch_buttons_unselect"; + private static final String PREFERENCE_BATCH_BUTTONS_ARCHIVE = "batch_buttons_archive"; + private static final String PREFERENCE_BATCH_BUTTONS_MOVE = "batch_buttons_move"; + private static final String PREFERENCE_BATCH_BUTTONS_FLAG = "batch_buttons_flag"; + private static final String PREFERENCE_BATCH_BUTTONS_UNSELECT = "batch_buttons_unselect"; private static final String PREFERENCE_MESSAGEVIEW_MOBILE_LAYOUT = "messageview_mobile_layout"; private static final String PREFERENCE_BACKGROUND_OPS = "background_ops"; From 2261edcfb4e8fb93d848e7cfbabdb70d66f62231 Mon Sep 17 00:00:00 2001 From: Mark Baker Date: Fri, 6 Jan 2012 22:29:33 +0000 Subject: [PATCH 05/91] High DPI version of archive button icon --- res/drawable-hdpi/ic_button_archive.png | Bin 0 -> 4768 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 res/drawable-hdpi/ic_button_archive.png diff --git a/res/drawable-hdpi/ic_button_archive.png b/res/drawable-hdpi/ic_button_archive.png new file mode 100644 index 0000000000000000000000000000000000000000..3850e2d29fb1bb1404487370f8e8392dee391b4a GIT binary patch literal 4768 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 Date: Sun, 26 Feb 2012 14:56:46 +0530 Subject: [PATCH 06/91] Create default sort setting by preference --- res/values/arrays.xml | 18 +++++++++ res/values/strings.xml | 4 ++ res/xml/account_settings_preferences.xml | 15 ++++++++ src/com/fsck/k9/Account.java | 37 +++++++++++++++++++ src/com/fsck/k9/activity/MessageList.java | 6 ++- .../k9/activity/setup/AccountSettings.java | 24 ++++++++++++ .../k9/controller/MessagingController.java | 2 +- .../fsck/k9/preferences/AccountSettings.java | 7 ++++ 8 files changed, 110 insertions(+), 3 deletions(-) diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 8608cb367..cc96d658c 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -149,6 +149,24 @@ NOT_SECOND_CLASS + + @string/sort_by_date + @string/sort_by_subject + @string/sort_by_sender + @string/sort_by_unread + @string/sort_by_flag + @string/sort_by_attach + + + + SORT_DATE + SORT_SUBJECT + SORT_SENDER + SORT_UNREAD + SORT_FLAGGED + SORT_ATTACHMENT + + @string/account_settings_show_pictures_never @string/account_settings_show_pictures_only_from_contacts diff --git a/res/values/strings.xml b/res/values/strings.xml index 51ea0c50f..a1e668f7d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -553,6 +553,10 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin Enable refile buttons Show the Archive, Move, and Spam buttons. + Default Sort Type + Sort order + Sort in ascending order + Always show images No From contacts diff --git a/res/xml/account_settings_preferences.xml b/res/xml/account_settings_preferences.xml index 9fa5a11a6..0356280ed 100644 --- a/res/xml/account_settings_preferences.xml +++ b/res/xml/account_settings_preferences.xml @@ -56,6 +56,21 @@ android:title="@string/account_settings_color_label" android:summary="@string/account_settings_color_summary" /> + + + + @@ -121,6 +125,8 @@ public class Account implements BaseAccount { private boolean mSaveAllHeaders; private boolean mPushPollOnConnect; private boolean mNotifySync; + private SORT_TYPE mSortType; + private boolean mSortAscending; private ShowPictures mShowPictures; private boolean mEnableMoveButtons; private boolean mIsSignatureBeforeQuotedText; @@ -210,6 +216,8 @@ public class Account implements BaseAccount { mFolderSyncMode = FolderMode.FIRST_CLASS; mFolderPushMode = FolderMode.FIRST_CLASS; mFolderTargetMode = FolderMode.NOT_SECOND_CLASS; + mSortType = DEFAULT_SORT_TYPE; + mSortAscending = DEFAULT_SORT_ASCENDING; mShowPictures = ShowPictures.NEVER; mEnableMoveButtons = false; mIsSignatureBeforeQuotedText = false; @@ -331,6 +339,15 @@ public class Account implements BaseAccount { (random.nextInt(0x70) * 0xffff) + 0xff000000); + try { + mSortType = SORT_TYPE.valueOf(prefs.getString(mUuid + ".sortTypeEnum", + SORT_TYPE.SORT_DATE.name())); + } catch (Exception e) { + mSortType = SORT_TYPE.SORT_DATE; + } + + mSortAscending = prefs.getBoolean(mUuid + ".sortAscending", false); + try { mShowPictures = ShowPictures.valueOf(prefs.getString(mUuid + ".showPicturesEnum", ShowPictures.NEVER.name())); @@ -463,6 +480,8 @@ public class Account implements BaseAccount { editor.remove(mUuid + ".messageFormatAuto"); editor.remove(mUuid + ".quoteStyle"); editor.remove(mUuid + ".quotePrefix"); + editor.remove(mUuid + ".sortTypeEnum"); + editor.remove(mUuid + ".sortAscending"); editor.remove(mUuid + ".showPicturesEnum"); editor.remove(mUuid + ".replyAfterQuote"); editor.remove(mUuid + ".stripSignature"); @@ -595,6 +614,8 @@ public class Account implements BaseAccount { editor.putString(mUuid + ".spamFolderName", mSpamFolderName); editor.putString(mUuid + ".autoExpandFolderName", mAutoExpandFolderName); editor.putInt(mUuid + ".accountNumber", mAccountNumber); + editor.putString(mUuid + ".sortTypeEnum", mSortType.name()); + editor.putBoolean(mUuid + ".sortAscending", mSortAscending); editor.putString(mUuid + ".showPicturesEnum", mShowPictures.name()); editor.putBoolean(mUuid + ".enableMoveButtons", mEnableMoveButtons); editor.putString(mUuid + ".folderDisplayMode", mFolderDisplayMode.name()); @@ -1000,6 +1021,22 @@ public class Account implements BaseAccount { this.mNotifySync = showOngoing; } + public synchronized SORT_TYPE getSortType() { + return mSortType; + } + + public synchronized void setSortType(SORT_TYPE sortType) { + mSortType = sortType; + } + + public synchronized boolean isSortAscending() { + return mSortAscending; + } + + public synchronized void setSortAscending(boolean sortAscending) { + mSortAscending = sortAscending; + } + public synchronized ShowPictures getShowPictures() { return mShowPictures; } diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java index f874267f9..d2238a27e 100644 --- a/src/com/fsck/k9/activity/MessageList.java +++ b/src/com/fsck/k9/activity/MessageList.java @@ -809,8 +809,10 @@ public class MessageList mStars = K9.messageListStars(); mCheckboxes = K9.messageListCheckboxes(); - sortType = mController.getSortType(); - sortAscending = mController.isSortAscending(sortType); + sortType = mAccount.getSortType(); + mController.setSortType(sortType); + sortAscending = mAccount.isSortAscending(); + mController.setSortAscending(sortType, sortAscending); sortDateAscending = mController.isSortAscending(SORT_TYPE.SORT_DATE); mController.addListener(mAdapter.mListener); diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/src/com/fsck/k9/activity/setup/AccountSettings.java index 9ac8f7058..140fb0f9c 100644 --- a/src/com/fsck/k9/activity/setup/AccountSettings.java +++ b/src/com/fsck/k9/activity/setup/AccountSettings.java @@ -28,6 +28,7 @@ import com.fsck.k9.activity.ChooseIdentity; import com.fsck.k9.activity.ColorPickerDialog; import com.fsck.k9.activity.K9PreferenceActivity; import com.fsck.k9.activity.ManageIdentities; +import com.fsck.k9.controller.MessagingController.SORT_TYPE; import com.fsck.k9.crypto.Apg; import com.fsck.k9.mail.Store; import com.fsck.k9.service.MailService; @@ -53,6 +54,8 @@ public class AccountSettings extends K9PreferenceActivity { private static final String PREFERENCE_FREQUENCY = "account_check_frequency"; private static final String PREFERENCE_DISPLAY_COUNT = "account_display_count"; private static final String PREFERENCE_DEFAULT = "account_default"; + private static final String PREFERENCE_SORT_TYPE = "sort_type_enum"; + private static final String PREFERENCE_SORT_ASCENDING = "sort_ascending"; private static final String PREFERENCE_SHOW_PICTURES = "show_pictures_enum"; private static final String PREFERENCE_ENABLE_MOVE_BUTTONS = "enable_move_buttons"; private static final String PREFERENCE_NOTIFY = "account_notify"; @@ -121,6 +124,8 @@ public class AccountSettings extends K9PreferenceActivity { private CheckBoxPreference mAccountDefault; private CheckBoxPreference mAccountNotify; private CheckBoxPreference mAccountNotifySelf; + private ListPreference mAccountSortType; + private CheckBoxPreference mAccountSortAscending; private ListPreference mAccountShowPictures; private CheckBoxPreference mAccountEnableMoveButtons; private CheckBoxPreference mAccountNotifySync; @@ -427,6 +432,22 @@ public class AccountSettings extends K9PreferenceActivity { mAccountEnableMoveButtons.setEnabled(mIsMoveCapable); mAccountEnableMoveButtons.setChecked(mAccount.getEnableMoveButtons()); + mAccountSortType = (ListPreference) findPreference(PREFERENCE_SORT_TYPE); + mAccountSortType.setValue("" + mAccount.getSortType()); + mAccountSortType.setSummary(mAccountSortType.getEntry()); + mAccountSortType.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { + public boolean onPreferenceChange(Preference preference, Object newValue) { + final String summary = newValue.toString(); + int index = mAccountSortType.findIndexOfValue(summary); + mAccountSortType.setSummary(mAccountSortType.getEntries()[index]); + mAccountSortType.setValue(summary); + return false; + } + }); + + mAccountSortAscending = (CheckBoxPreference) findPreference(PREFERENCE_SORT_ASCENDING); + mAccountSortAscending.setChecked(mAccount.isSortAscending()); + mAccountShowPictures = (ListPreference) findPreference(PREFERENCE_SHOW_PICTURES); mAccountShowPictures.setValue("" + mAccount.getShowPictures()); mAccountShowPictures.setSummary(mAccountShowPictures.getEntry()); @@ -750,6 +771,9 @@ public class AccountSettings extends K9PreferenceActivity { } } + mAccount.setSortType(SORT_TYPE.valueOf(mAccountSortType.getValue())); + mAccount.setSortAscending(mAccountSortAscending.isChecked()); + mAccount.setShowPictures(Account.ShowPictures.valueOf(mAccountShowPictures.getValue())); if (mIsPushCapable) { diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java index 1b2b47a6b..c23a02162 100644 --- a/src/com/fsck/k9/controller/MessagingController.java +++ b/src/com/fsck/k9/controller/MessagingController.java @@ -173,7 +173,7 @@ public class MessagingController implements Runnable { } } - private SORT_TYPE sortType = SORT_TYPE.SORT_DATE; + private SORT_TYPE sortType = Account.DEFAULT_SORT_TYPE; private MessagingListener checkMailListener = null; diff --git a/src/com/fsck/k9/preferences/AccountSettings.java b/src/com/fsck/k9/preferences/AccountSettings.java index fdc311820..67c55c0cf 100644 --- a/src/com/fsck/k9/preferences/AccountSettings.java +++ b/src/com/fsck/k9/preferences/AccountSettings.java @@ -12,6 +12,7 @@ import com.fsck.k9.Account; import com.fsck.k9.K9; import com.fsck.k9.R; import com.fsck.k9.Account.FolderMode; +import com.fsck.k9.controller.MessagingController.SORT_TYPE; import com.fsck.k9.crypto.Apg; import com.fsck.k9.mail.store.StorageManager; import com.fsck.k9.preferences.Settings.*; @@ -156,6 +157,12 @@ public class AccountSettings { s.put("sentFolderName", Settings.versions( new V(1, new StringSetting("Sent")) )); + s.put("sortTypeEnum", Settings.versions( + new V(1, new EnumSetting(SORT_TYPE.class, Account.DEFAULT_SORT_TYPE)) + )); + s.put("sortAscending", Settings.versions( + new V(1, new BooleanSetting(Account.DEFAULT_SORT_ASCENDING)) + )); s.put("showPicturesEnum", Settings.versions( new V(1, new EnumSetting(Account.ShowPictures.class, Account.ShowPictures.NEVER)) )); From 3ebd3c1fc2f82c924c175d47763e505233ad3f86 Mon Sep 17 00:00:00 2001 From: Srinath Warrier Date: Mon, 12 Mar 2012 22:04:10 +0530 Subject: [PATCH 07/91] Create implicit sort remembering setting --- res/values/arrays.xml | 18 -------------- res/values/strings.xml | 4 ---- res/xml/account_settings_preferences.xml | 15 ------------ src/com/fsck/k9/activity/MessageList.java | 9 ++++++- .../k9/activity/setup/AccountSettings.java | 24 ------------------- 5 files changed, 8 insertions(+), 62 deletions(-) diff --git a/res/values/arrays.xml b/res/values/arrays.xml index cc96d658c..8608cb367 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -149,24 +149,6 @@ NOT_SECOND_CLASS - - @string/sort_by_date - @string/sort_by_subject - @string/sort_by_sender - @string/sort_by_unread - @string/sort_by_flag - @string/sort_by_attach - - - - SORT_DATE - SORT_SUBJECT - SORT_SENDER - SORT_UNREAD - SORT_FLAGGED - SORT_ATTACHMENT - - @string/account_settings_show_pictures_never @string/account_settings_show_pictures_only_from_contacts diff --git a/res/values/strings.xml b/res/values/strings.xml index a1e668f7d..51ea0c50f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -553,10 +553,6 @@ Welcome to K-9 Mail setup. K-9 is an open source mail client for Android origin Enable refile buttons Show the Archive, Move, and Spam buttons. - Default Sort Type - Sort order - Sort in ascending order - Always show images No From contacts diff --git a/res/xml/account_settings_preferences.xml b/res/xml/account_settings_preferences.xml index 0356280ed..9fa5a11a6 100644 --- a/res/xml/account_settings_preferences.xml +++ b/res/xml/account_settings_preferences.xml @@ -56,21 +56,6 @@ android:title="@string/account_settings_color_label" android:summary="@string/account_settings_color_summary" /> - - - - Date: Mon, 12 Mar 2012 22:55:31 +0530 Subject: [PATCH 08/91] Create implicit sort remembering setting2(minor indentation error) --- src/com/fsck/k9/activity/MessageList.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java index c91565e16..9eae5ab22 100644 --- a/src/com/fsck/k9/activity/MessageList.java +++ b/src/com/fsck/k9/activity/MessageList.java @@ -1195,8 +1195,7 @@ public class MessageList mAccount.setSortType(sortType); mAccount.setSortAscending(sortAscending); mAccount.save(Preferences.getPreferences(this)); - - reSort(); + reSort(); } } From 5bc28e04bce85d2b8b15fdfd862803422c454fb6 Mon Sep 17 00:00:00 2001 From: Dmitry Ashkadov Date: Fri, 6 Apr 2012 00:02:30 +0400 Subject: [PATCH 09/91] Updates to Russian translation --- res/values-ru/strings.xml | 129 +++++++++++++++++++------------------- 1 file changed, 66 insertions(+), 63 deletions(-) diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index fb1452369..20496a831 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -7,7 +7,7 @@ Лицензия Apache License, Version 2.0. Авторы: %s Информация об изменениях: %s - Мы используем следующие тертьесторонние библиотеки: %s + Мы используем следующие библиотеки третьих сторон: %s Иконки настроения: %s читать вложения электронной почты @@ -108,9 +108,9 @@ Показать/спрятать подробности Добавить Копию/СК Редактировать тему - - - + Уведомление о прочтении + Уведомление о прочтении будет запрошено + Уведомление о прочтении не будет запрошено Добавить вложение Добавить вложение (Изображение) Добавить вложение (Видео) @@ -324,8 +324,8 @@ Использовать шрифт фиксированной ширины при показе плоского текста Вернуться к списку после удаления Вернуться к списку сообщений после удаления сообщения - - + Показать след. сообщение после удаления + По умолчанию показывать след. сообщение после удаления Подтверждение действий Показывать диалог при совершении действий @@ -340,7 +340,7 @@ Время тишины Запретить сигнал, вибрацию, мигание в ночное время - Начинало времени тишины + Начало времени тишины Конец времени тишины Установить новый адрес @@ -414,7 +414,7 @@ В ходе каждого запроса Только вручную - + Автоопределение области имен IMAP Префикс пути IMAP Имя папки Черновиков @@ -550,11 +550,11 @@ При ответе цитата будет выше ответа. Формат сообщения - Плоский текст (изображения и форматирование не сохраняется) + Обычный текст (изображения и форматирование не сохраняется) HTML (сохранять изображения и форматирование) - - + Уведомление о прочтении + Всегда запрашивать уведомление о прочтении Стиль цитирования Префикс (например Gmail, Pine) @@ -582,7 +582,7 @@ Цвет учётной записи Выберите цвет учётной записи, используемый в папке и списке учётных записей - Notification LED color + Цвет светодиода для уведомления Выбрать цвет мигания для учётной записи Количество показываемых сообщений @@ -680,13 +680,13 @@ Звонок при новых сообщениях Вибрация Вибрация при новых сообщениях - Паттерн вибрации + Тип вибрации По умолчанию - паттерн 1 - паттерн 2 - паттерн 3 - паттерн 4 - паттерн 5 + Вибрация 1 + Вибрация 2 + Вибрация 3 + Вибрация 4 + Вибрация 5 Повторять вибрацию Выбор мелодии Мигать @@ -839,7 +839,7 @@ Никогда Всегда Когда \'Фоновый режим\' включен - Когда \'Фоновые данные\' & \'Автосинхронизация\' включены + Когда \'Фоновые данные\' и \'Автосинхронизация\' включены Никаких сообщшний не выбранно @@ -956,11 +956,11 @@ Дата Тело сообщения - самый крочшечный + Самый крочшечный Крошечный Еще меньше Маленький - средний + Средний Большой Наибольший @@ -1033,46 +1033,49 @@ › Не получается соединиться. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Импорт и экспорт настроек + + Экспортировать настройки учетной записи + Экспортировать настройки и учетные записи + Импорт + Экспорт + Импортировать настройки + Импортировать выбранное + Глобальные настройки + Экспорт настроек... + Импорт настроек... + Сканирование файла... + Настройки были экспортированы в %s + Глобальные настройки были импортированы из %s + Импортирован %s из %s + + 1 учетная запись + %s учетных записи + %s учетных записей + + Не удалось экспортировать настройки + Не удалось экспортировать настройки из %s + Экспорт удался + Экспорт не удался + Импорт удался + Импорт не удался + Активировать учетную запись + Чтобы использовать учетную запись \"%s\", Вам необходимо указать %s. + + пароль + пароля + паролей + + Сервер для входящей почты (%s): + Сервер для исходящей почты (%s): + + Установка пароля... + Установка паролей... + + Использовать пароль от сервера для входящей почты + Активировать - + Невозможно определить версию файла %s Учётная запись\"%s\" недоступна; проверьте хранилище @@ -1080,8 +1083,8 @@ Сохранить вложение Не найден браузер файлов. Где бы вы хотели сохранить вложение? - - - + Переместить вверх + Переместить вниз + Перемещение учетной записи... From 166428c9b65f69691b89433936bbb1f22aaa9f35 Mon Sep 17 00:00:00 2001 From: Andrew Chen Date: Fri, 6 Apr 2012 11:17:48 -0700 Subject: [PATCH 10/91] Commit latest IntelliJ settings added by IntelliJ 11.1. --- k9mail.iml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/k9mail.iml b/k9mail.iml index 1d380b11c..1162b4539 100644 --- a/k9mail.iml +++ b/k9mail.iml @@ -20,6 +20,10 @@