moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-17 07:30:16 -05:00
Code Issues Releases Wiki Activity

Added the global sort settings to the import/export table

Browse Source
This commit is contained in:
cketti 2012-05-15 08:13:30 +02:00
parent c64c14c4a6
commit bf7a6ba398
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/com/fsck/k9/preferences/GlobalSettings.java
View File

@ -12,9 +12,11 @@ import java.util.TreeMap;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.os.Environment; import android.os.Environment;
import com.fsck.k9.Account;
import com.fsck.k9.FontSizes; import com.fsck.k9.FontSizes;
import com.fsck.k9.K9; import com.fsck.k9.K9;
import com.fsck.k9.R; import com.fsck.k9.R;
import com.fsck.k9.Account.SortType;
import com.fsck.k9.helper.DateFormatter; import com.fsck.k9.helper.DateFormatter;
import com.fsck.k9.preferences.Settings.*; import com.fsck.k9.preferences.Settings.*;
@ -182,6 +184,12 @@ public class GlobalSettings {
s.put("showCorrespondentNames", Settings.versions( s.put("showCorrespondentNames", Settings.versions(
new V(1, new BooleanSetting(true)) new V(1, new BooleanSetting(true))
)); ));
s.put("sortTypeEnum", Settings.versions(
new V(10, new EnumSetting(SortType.class, Account.DEFAULT_SORT_TYPE))
));
s.put("sortAscending", Settings.versions(
new V(10, new BooleanSetting(Account.DEFAULT_SORT_ASCENDING))
));
s.put("startIntegratedInbox", Settings.versions( s.put("startIntegratedInbox", Settings.versions(
new V(1, new BooleanSetting(false)) new V(1, new BooleanSetting(false))
)); ));
@ -202,23 +210,23 @@ public class GlobalSettings {
new V(4, new BooleanSetting(true)) new V(4, new BooleanSetting(true))
)); ));
s.put("batchButtonsMarkRead", Settings.versions( s.put("batchButtonsMarkRead", Settings.versions(
new V(8, new BooleanSetting(true)) new V(8, new BooleanSetting(true))
)); ));
s.put("batchButtonsDelete", Settings.versions( s.put("batchButtonsDelete", Settings.versions(
new V(8, new BooleanSetting(true)) new V(8, new BooleanSetting(true))
)); ));
s.put("batchButtonsArchive", Settings.versions( s.put("batchButtonsArchive", Settings.versions(
new V(8, new BooleanSetting(false)) new V(8, new BooleanSetting(false))
)); ));
s.put("batchButtonsMove", Settings.versions( s.put("batchButtonsMove", Settings.versions(
new V(8, new BooleanSetting(false)) new V(8, new BooleanSetting(false))
)); ));
s.put("batchButtonsFlag", Settings.versions( s.put("batchButtonsFlag", Settings.versions(
new V(8, new BooleanSetting(true)) new V(8, new BooleanSetting(true))
)); ));
s.put("batchButtonsUnselect", Settings.versions( s.put("batchButtonsUnselect", Settings.versions(
new V(8, new BooleanSetting(true)) new V(8, new BooleanSetting(true))
)); ));
SETTINGS = Collections.unmodifiableMap(s); SETTINGS = Collections.unmodifiableMap(s);

2
src/com/fsck/k9/preferences/Settings.java
View File

@ -35,7 +35,7 @@ public class Settings {
* *
* @see SettingsExporter * @see SettingsExporter
*/ */
public static final int VERSION = 9; public static final int VERSION = 10;
public static Map<String, Object> validate(int version, Map<String, public static Map<String, Object> validate(int version, Map<String,
TreeMap<Integer, SettingsDescription>> settings, TreeMap<Integer, SettingsDescription>> settings,