Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-20 22:26:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

assign dicts as soon as language is changed.

Browse source
This commit is contained in:
Andy2 2011-04-27 06:39:52 -07:00
parent 399fc081d7
commit 9013897a5a
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java
View file

@ -693,9 +693,9 @@ public class GameConfig extends XWActivity
if ( chosen.equals( m_browseText ) ) { if ( chosen.equals( m_browseText ) ) {
startActivity( Utils.mkDownloadActivity(GameConfig.this) ); startActivity( Utils.mkDownloadActivity(GameConfig.this) );
} else { } else {
m_gi.dictLang = m_gi.setLang( DictLangCache.
DictLangCache.getLangLangCode( GameConfig.this, getLangLangCode( GameConfig.this,
chosen ); chosen ) );
} }
} }

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameUtils.java
View file

@ -352,7 +352,7 @@ public class GameUtils {
byte[] stream = savedGame( context, path ); byte[] stream = savedGame( context, path );
CurGameInfo gi = new CurGameInfo( context ); CurGameInfo gi = new CurGameInfo( context );
XwJNI.gi_from_stream( gi, stream ); XwJNI.gi_from_stream( gi, stream );
final String[] dictNames = gi.dictNames( false ); final String[] dictNames = gi.dictNames();
HashSet<String> missingSet; HashSet<String> missingSet;
String[] installed = dictList( context ); String[] installed = dictList( context );

17
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CurGameInfo.java
View file

@ -137,6 +137,14 @@ public class CurGameInfo {
m_inProgress = inProgress; m_inProgress = inProgress;
} }
public void setLang( int lang )
{
if ( dictLang != lang ) {
dictLang = lang;
assignDicts();
}
}
public int getRobotSmartness() public int getRobotSmartness()
{ {
if ( m_smartness == 0 ) { if ( m_smartness == 0 ) {
@ -239,15 +247,6 @@ public class CurGameInfo {
public String[] dictNames() public String[] dictNames()
{ {
return dictNames( true );
}
public String[] dictNames( boolean assign )
{
if ( assign ) {
assignDicts();
}
String[] result = new String[nPlayers+1]; String[] result = new String[nPlayers+1];
result[0] = dictName; result[0] = dictName;
for ( int ii = 0; ii < nPlayers; ++ii ) { for ( int ii = 0; ii < nPlayers; ++ii ) {