Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-04 23:02:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change text for blank-out-filter-config Clear, not Reset

Browse source 
Reset somehow makes me expect the filter to be re-applied after the
inputs are removed.
This commit is contained in:
Eric House 2021-03-25 12:09:35 -07:00
parent 59acc5d619
commit 430750e23a
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictBrowseDelegate.java
View file

@ -275,7 +275,7 @@ public class DictBrowseDelegate extends DelegateBase
m_desc = XwJNI.dict_getDesc( m_dict ); m_desc = XwJNI.dict_getDesc( m_dict );
int[] ids = { R.id.button_useconfig, R.id.button_addBlank, int[] ids = { R.id.button_useconfig, R.id.button_addBlank,
R.id.button_reset, }; R.id.button_clear, };
for ( int id : ids ) { for ( int id : ids ) {
findViewById( id ).setOnClickListener(this); findViewById( id ).setOnClickListener(this);
} }
@ -430,7 +430,7 @@ public class DictBrowseDelegate extends DelegateBase
case R.id.button_addBlank: case R.id.button_addBlank:
addBlankButtonClicked(); addBlankButtonClicked();
break; break;
case R.id.button_reset: case R.id.button_clear:
resetClicked(); resetClicked();
break; break;
default: default:
@ -843,7 +843,7 @@ public class DictBrowseDelegate extends DelegateBase
mResetChecker = null; mResetChecker = null;
} else if ( null == mResetChecker ) { } else if ( null == mResetChecker ) {
final Handler handler = new Handler(); final Handler handler = new Handler();
final Button resetButton = (Button)findViewById(R.id.button_reset); final Button resetButton = (Button)findViewById(R.id.button_clear);
mResetChecker = new Runnable() { mResetChecker = new Runnable() {
@Override @Override
public void run() { public void run() {

4
xwords4/android/app/src/main/res/layout/dict_browser.xml
View file

@ -119,10 +119,10 @@
android:text="@string/button_addBlank" android:text="@string/button_addBlank"
android:enabled="false" android:enabled="false"
/> />
<Button android:id="@+id/button_reset" <Button android:id="@+id/button_clear"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:text="@string/button_reset" android:text="@string/button_clear"
android:enabled="false" android:enabled="false"
/> />
</LinearLayout> </LinearLayout>

2
xwords4/android/app/src/main/res/values/strings.xml
View file

@ -1567,6 +1567,8 @@
<string name="button_useconfig">Apply Filter</string> <string name="button_useconfig">Apply Filter</string>
<!-- Button in wordlist filter: keep it short!!!! --> <!-- Button in wordlist filter: keep it short!!!! -->
<string name="button_addBlank">+Blank</string> <string name="button_addBlank">+Blank</string>
<!-- Button to clear wordlist filter config (but not re-apply the filter) -->
<string name="button_clear">Clear</string>
<!-- String showing user what filter is in use. Substitutions are <!-- String showing user what filter is in use. Substitutions are
1) the filter pattern, 2) minimum and 3) maximum lengths, and 1) the filter pattern, 2) minimum and 3) maximum lengths, and
4) number of words in the filtered list. --> 4) number of words in the filtered list. -->