Picking back up in the middle of a major refactoring of the UI, tyring

[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryApplication.java

diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java
index b47fb49a62ca5694a263720a60c49be051a0faa7..09e7ba44e995d2ef7f425d799863aea400435e98 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryApplication.java
+++ b/src/com/hughes/android/dictionary/DictionaryApplication.java
@@ -14,19 +14,6 @@
 
 package com.hughes.android.dictionary;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
 import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
@@ -35,10 +22,10 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.net.Uri;
 import android.preference.PreferenceManager;
 import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MenuItem.OnMenuItemClickListener;
 
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuItem;
+import com.actionbarsherlock.view.MenuItem.OnMenuItemClickListener;
 import com.hughes.android.dictionary.engine.Dictionary;
 import com.hughes.android.dictionary.engine.Language;
 import com.hughes.android.dictionary.engine.TransliteratorManager;
@@ -46,6 +33,19 @@ import com.hughes.android.util.PersistentObjectCache;
 import com.hughes.util.ListUtil;
 import com.ibm.icu.text.Collator;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
 public class DictionaryApplication extends Application {
   
   static final String LOG = "QuickDicApp";
@@ -124,6 +124,7 @@ public class DictionaryApplication extends Application {
   public void onCreateGlobalOptionsMenu(
       final Context context, final Menu menu) {
     final MenuItem about = menu.add(getString(R.string.about));
+    about.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
     about.setOnMenuItemClickListener(new OnMenuItemClickListener() {
       public boolean onMenuItemClick(final MenuItem menuItem) {
         final Intent intent = new Intent().setClassName(AboutActivity.class
@@ -134,6 +135,7 @@ public class DictionaryApplication extends Application {
     });
 
     final MenuItem help = menu.add(getString(R.string.help));
+    help.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
     help.setOnMenuItemClickListener(new OnMenuItemClickListener() {
       public boolean onMenuItemClick(final MenuItem menuItem) {
         context.startActivity(HtmlDisplayActivity.getHelpLaunchIntent());
@@ -141,12 +143,13 @@ public class DictionaryApplication extends Application {
       }
     });
 
-    final MenuItem preferences = menu.add(getString(R.string.preferences));
+    final MenuItem preferences = menu.add(getString(R.string.settings));
+    preferences.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
     preferences.setOnMenuItemClickListener(new OnMenuItemClickListener() {
       public boolean onMenuItemClick(final MenuItem menuItem) {
-        PreferenceActivity.prefsMightHaveChanged = true;
-        final Intent intent = new Intent().setClassName(PreferenceActivity.class
-            .getPackage().getName(), PreferenceActivity.class.getCanonicalName());
+        SettingsActivity.settingsMightHaveChanged = true;
+        final Intent intent = new Intent().setClassName(SettingsActivity.class
+            .getPackage().getName(), SettingsActivity.class.getCanonicalName());
         context.startActivity(intent);
         return false;
       }
@@ -154,6 +157,7 @@ public class DictionaryApplication extends Application {
     
     
     final MenuItem reportIssue = menu.add(getString(R.string.reportIssue));
+    reportIssue.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
     reportIssue.setOnMenuItemClickListener(new OnMenuItemClickListener() {
       public boolean onMenuItemClick(final MenuItem menuItem) {
         final Intent intent = new Intent(Intent.ACTION_VIEW);
@@ -189,8 +193,7 @@ public class DictionaryApplication extends Application {
     return new File(getDictDir(), uncompressedFilename);
   }
   
-  
-  
+
   String defaultLangISO2 = Locale.getDefault().getLanguage().toLowerCase();
   String defaultLangName = null;
   final Map<String, String> fileToNameCache = new LinkedHashMap<String, String>();
@@ -278,6 +281,10 @@ public class DictionaryApplication extends Application {
   final Comparator<DictionaryInfo> dictionaryInfoComparator = new Comparator<DictionaryInfo>() {
     @Override
     public int compare(DictionaryInfo d1, DictionaryInfo d2) {
+      // Single-index dictionaries first.
+      if (d1.indexInfos.size() != d2.indexInfos.size()) {
+          return d1.indexInfos.size() - d2.indexInfos.size();
+      }
       return uncompressedFilenameComparator.compare(d1.uncompressedFilename, d2.uncompressedFilename);
     }
   };