GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 19:42:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

GFTranslator to DGTranslator in a few more places

Browse Source
This commit is contained in:
kr.angelov
2014-04-03 14:06:26 +00:00
parent ba5e918b69
commit 6a8f271ba5
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/android/AndroidManifest.xml
View File

@@ -15,7 +15,7 @@
android:allowBackup="true" android:allowBackup="true"
android:icon="@drawable/dg_short" android:icon="@drawable/dg_short"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/AppTheme" android:name="GFTranslator"> android:theme="@style/AppTheme" android:name="DGTranslator">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:label="@string/app_name" > android:label="@string/app_name" >

2
src/ui/android/src/org/grammaticalframework/ui/android/GFTranslator.java → src/ui/android/src/org/grammaticalframework/ui/android/DGTranslator.java
View File

@@ -2,7 +2,7 @@ package org.grammaticalframework.ui.android;
import android.app.Application; import android.app.Application;
public class GFTranslator extends Application { public class DGTranslator extends Application {
private Translator mTranslator; private Translator mTranslator;
@Override @Override

2
src/ui/android/src/org/grammaticalframework/ui/android/LexicalEntryActivity.java
View File

@@ -38,7 +38,7 @@ public class LexicalEntryActivity extends ListActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_lexical_entry); setContentView(R.layout.activity_lexical_entry);
mTranslator = ((GFTranslator) getApplicationContext()).getTranslator(); mTranslator = ((DGTranslator) getApplicationContext()).getTranslator();
mShowLanguageView = (LanguageSelector) findViewById(R.id.show_language); mShowLanguageView = (LanguageSelector) findViewById(R.id.show_language);
mShowLanguageView.setLanguages(mTranslator.getAvailableLanguages()); mShowLanguageView.setLanguages(mTranslator.getAvailableLanguages());

2
src/ui/android/src/org/grammaticalframework/ui/android/MainActivity.java
View File

@@ -104,7 +104,7 @@ public class MainActivity extends Activity {
mTts = new TTS(this); mTts = new TTS(this);
mTranslator = ((GFTranslator) getApplicationContext()).getTranslator(); mTranslator = ((DGTranslator) getApplicationContext()).getTranslator();
mSourceLanguageView.setLanguages(mTranslator.getAvailableLanguages()); mSourceLanguageView.setLanguages(mTranslator.getAvailableLanguages());
mSourceLanguageView.setOnLanguageSelectedListener(new OnLanguageSelectedListener() { mSourceLanguageView.setOnLanguageSelectedListener(new OnLanguageSelectedListener() {

2
src/ui/android/src/org/grammaticalframework/ui/android/TranslatorInputMethodService.java
View File

@@ -41,7 +41,7 @@ public class TranslatorInputMethodService extends InputMethodService
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
mTranslator = ((GFTranslator) getApplicationContext()).getTranslator(); mTranslator = ((DGTranslator) getApplicationContext()).getTranslator();
mSymbolsPage1Keyboard = null; mSymbolsPage1Keyboard = null;
mSymbolsPage2Keyboard = null; mSymbolsPage2Keyboard = null;

2
src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboard.java
View File

@@ -24,7 +24,7 @@ public class TranslatorKeyboard extends Keyboard {
public TranslatorKeyboard(Context context, int xmlLayoutResId, int modeId) { public TranslatorKeyboard(Context context, int xmlLayoutResId, int modeId) {
super(context, xmlLayoutResId, modeId); super(context, xmlLayoutResId, modeId);
mTranslator = ((GFTranslator) context.getApplicationContext()).getTranslator(); mTranslator = ((DGTranslator) context.getApplicationContext()).getTranslator();
updateLanguageKeyLabels(); updateLanguageKeyLabels();
} }

4
src/ui/android/src/org/grammaticalframework/ui/android/TranslatorKeyboardView.java
View File

@@ -20,12 +20,12 @@ public class TranslatorKeyboardView extends KeyboardView {
public TranslatorKeyboardView(Context context, AttributeSet attrs) { public TranslatorKeyboardView(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
mTranslator = ((GFTranslator) context.getApplicationContext()).getTranslator(); mTranslator = ((DGTranslator) context.getApplicationContext()).getTranslator();
} }
public TranslatorKeyboardView(Context context, AttributeSet attrs, int defStyle) { public TranslatorKeyboardView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle); super(context, attrs, defStyle);
mTranslator = ((GFTranslator) context.getApplicationContext()).getTranslator(); mTranslator = ((DGTranslator) context.getApplicationContext()).getTranslator();
} }
private PopupWindow mLanguagesPopup = null; private PopupWindow mLanguagesPopup = null;