better about.
android:paddingBottom="10dip"/>
<TextView
- android:id="@+id/copying"
- android:text="@string/COPYING"
+ android:id="@+id/license"
+ android:text="@string/license"
+ android:autoLink="web"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="left"/>
+
+ <TextView
+ android:id="@+id/licenseUrl"
+ android:text="@string/licenseUrl"
android:autoLink="web"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
<string name="removeAllDictionaries">Remove all dictionaries</string>
<string name="editDictionary">Edit dictionary config</string>
<string name="deleteDictionary">Delete dictionary</string>
- <string name="moveUp">Move up</string>
- <string name="newDictionary">New Dictionary</string>
+ <string name="moveToTop">Move to top</string>
+ <string name="newDictionary">New dictionary</string>
+ <string name="notOnDevice">%s (not on device)</string>
<string name="thanksForUpdating"><![CDATA[
<html>
Thanks for updating QuickDic.
<p> New features:
<ul>
- <li> Easily work with multiple dictionaries.
+ <li> Many more dictionaries based on enwiktionary.com data.
</ul>
- <p>The new version requires you to re-download dictionaries you want to use.<br/>
</body>
</html>
]]>
<string name="failedToUnzipDictionary">Failed to unzip dictionary...</string>
<!-- About. -->
- <string name="titleWithVersion">QuickDic 2.0</string>
+ <string name="titleWithVersion">QuickDic 3.0</string>
<string name="thadHughes">Thad Hughes</string>
- <string name="contactMe">If you\'re using QuickDic, I\'d love to hear from you. Please send comments, suggestions, bug reports, or just a quick hello to:</string>
+ <string name="contactMe">If you\'re using QuickDic, I\'d love to hear from you. Unfortunately, I cannot take responsibility for dictionary content, as it is generated from other sources. Please send comments, suggestions, bug reports, or just a quick hello to:</string>
<string name="myEmail" formatted="false">thad.hughes@gmail.com</string>
<string name="webPage">For more information, see:</string>
<string name="webPageUrl">http://sites.google.com/site/quickdic/home</string>
- <string name="COPYING">http://www.apache.org/licenses/LICENSE-2.0</string>
+ <string name="license">QuickDic contains code copyrighted by Google and released under the Apache 2.0 license.</string>
+ <string name="licenseUrl">http://www.apache.org/licenses/LICENSE-2.0</string>
<!-- Download. -->
<string name="openingConnection">Opening connection...</string>
\r
setContentView(R.layout.dictionary_activity);\r
searchText = (EditText) findViewById(R.id.SearchText);\r
+ searchText.set\r
+ \r
langButton = (Button) findViewById(R.id.LangButton);\r
\r
searchText.requestFocus();\r
searchText.requestFocus();\r
Log.d(LOG, "Trying to show soft keyboard.");\r
final InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);\r
- manager.showSoftInput(searchText, InputMethodManager.SHOW_IMPLICIT);\r
+ manager.showSoftInput(searchText, InputMethodManager.SHOW_FORCED);\r
}\r
\r
void updateLangButton() {\r
});\r
}\r
\r
+ {\r
+ final MenuItem about = menu.add(getString(R.string.about));\r
+ about.setOnMenuItemClickListener(new OnMenuItemClickListener() {\r
+ public boolean onMenuItemClick(final MenuItem menuItem) {\r
+ final Intent intent = new Intent().setClassName(AboutActivity.class\r
+ .getPackage().getName(), AboutActivity.class.getCanonicalName());\r
+ startActivity(intent);\r
+ return false;\r
+ }\r
+ });\r
+ }\r
+\r
return true;\r
}\r
\r
rawText.append(row.getTokenRow(true).getToken()).append("\t");\r
rawText.append(row.getRawText(saveOnlyFirstSubentry));\r
Log.d(LOG, "Writing : " + rawText);\r
+\r
+ // Request focus so that if we start typing again, it clears the text input.\r
+ getListView().requestFocus();\r
+\r
try {\r
wordList.getParentFile().mkdirs();\r
final PrintWriter out = new PrintWriter(\r
Log.d(LOG, "Clearing dictionary prefs.");\r
DictionaryActivity.clearDictionaryPrefs(this);\r
}\r
+ if (keyCode == KeyEvent.KEYCODE_ENTER) {\r
+ Log.d(LOG, "Trying to hide soft keyboard.");\r
+ final InputMethodManager manager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);\r
+ manager.hideSoftInputFromWindow(searchText, InputMethodManager.SHOW_FORCED);\r
+\r
+ }\r
return super.onKeyDown(keyCode, event);\r
}\r
\r
package com.hughes.android.dictionary;
+import java.io.File;
+
import android.app.AlertDialog;
import android.app.ListActivity;
import android.content.Context;
});
if (adapterContextMenuInfo.position > 0) {
- final MenuItem moveUpMenuItem = menu.add(R.string.moveUp);
- moveUpMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+ final MenuItem moveToTopMenuItem = menu.add(R.string.moveToTop);
+ moveToTopMenuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
@Override
public boolean onMenuItemClick(MenuItem item) {
final DictionaryConfig dictionaryConfig = quickDicConfig.dictionaryConfigs.remove(adapterContextMenuInfo.position);
- quickDicConfig.dictionaryConfigs.add(adapterContextMenuInfo.position - 1, dictionaryConfig);
+ quickDicConfig.dictionaryConfigs.add(0, dictionaryConfig);
dictionaryConfigsChanged();
return true;
}
final DictionaryConfig dictionaryConfig = getItem(position);
final TableLayout tableLayout = new TableLayout(parent.getContext());
final TextView view = new TextView(parent.getContext());
+
+ String name = dictionaryConfig.name;
+ if (!new File(dictionaryConfig.localFile).canRead()) {
+ name = getString(R.string.notOnDevice, dictionaryConfig.name);
+ }
- view.setText(dictionaryConfig.name);
+ view.setText(name);
view.setTextSize(20);
tableLayout.addView(view);
public QuickDicConfig() {
addDefaultDictionaries();
}
+
+ static final String BASE_URL = "http://dictionarydata.quickdic-dictionary.googlecode.com/git/outputs/";
public void addDefaultDictionaries() {
{
final DictionaryConfig config = new DictionaryConfig();
config.name = "German<->English";
- config.downloadUrl = "https://sites.google.com/site/quickdic/dictionaries-1/DE-EN_chemnitz_enwiktionary.quickdic.zip?attredirects=0&d=1";
+ config.downloadUrl = BASE_URL + "DE-EN_chemnitz_enwiktionary.quickdic.zip";
config.localFile = "/sdcard/quickDic/DE-EN_chemnitz_enwiktionary.quickdic";
addOrReplace(config);
}
continue;
}
final DictionaryConfig config = new DictionaryConfig();
- config.name = String.format("EN<->%s English<->%s (Wiktionary)", iso, Language.isoCodeToWikiName.get(iso));
- config.downloadUrl = String.format("https://sites.google.com/site/quickdic/dictionaries-1/EN-%s_enwiktionary.quickdic.zip?attredirects=0&d=1", iso);
+ config.name = String.format("English<->%s", Language.isoCodeToWikiName.get(iso));
+ config.downloadUrl = String.format("%sEN-%s_enwiktionary.quickdic.zip", BASE_URL, iso);
config.localFile = String.format("/sdcard/quickDic/EN-%s_enwiktionary.quickdic", iso);
addOrReplace(config);
}
isoCodeToWikiName.put("DE", "German");\r
isoCodeToWikiName.put("EL", "Greek");\r
isoCodeToWikiName.put("haw", "Hawaiian");\r
- isoCodeToWikiName.put("HE", "Hewbrew");\r
+ isoCodeToWikiName.put("HE", "Hebrew");\r
isoCodeToWikiName.put("HI", "Hindi");\r
isoCodeToWikiName.put("IS", "Icelandic");\r
isoCodeToWikiName.put("GA", "Irish");\r
projects / Dictionary.git / commitdiff
