mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-11 08:30:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add an explicit 'None' option to the 'Speak punctuation' setting.

Browse Source
This commit is contained in:
Reece H. Dunn
2013-09-09 15:49:09 +01:00
parent aebd02fa68
commit 1891740f80
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/res/layout/speak_punctuation_preference.xml
+10 -4
View File
@@ -7,7 +7,8 @@
<RadioGroup
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:focusable="false">
android:focusable="false"
android:id="@+id/options">
<RadioButton
android:layout_width="match_parent"
@@ -27,13 +28,18 @@
android:focusable="false"
android:focusableInTouchMode="false"
android:clickable="true" />
<RadioButton
android:layout_width="match_parent"
android:layout_height="48dp"
android:text="@string/punctuation_none"
android:id="@+id/none" />
</RadioGroup>
<EditText
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_height="48dp"
android:id="@+id/punctuation_characters"
android:hint="@string/punctuation_characters"
android:layout_marginLeft="32dp" />
android:hint="@string/punctuation_characters" />
</LinearLayout>
android/src/com/reecedunn/espeak/SpeakPunctuationPreference.java
+16 -5
View File
@@ -32,6 +32,7 @@ import android.widget.TextView;
public class SpeakPunctuationPreference extends DialogPreference {
private RadioButton mAll;
private RadioButton mCustom;
private RadioButton mNone;
private EditText mPunctuationCharacters;
private VoiceSettings mSettings;
@@ -80,6 +81,7 @@ public class SpeakPunctuationPreference extends DialogPreference {
View root = super.onCreateDialogView();
mAll = (RadioButton)root.findViewById(R.id.all);
mCustom = (RadioButton)root.findViewById(R.id.custom);
mNone = (RadioButton)root.findViewById(R.id.none);
mPunctuationCharacters = (EditText)root.findViewById(R.id.punctuation_characters);
return root;
}
@@ -88,10 +90,16 @@ public class SpeakPunctuationPreference extends DialogPreference {
protected void onBindDialogView(View view) {
super.onBindDialogView(view);
if (mSettings.getPunctuationLevel() == SpeechSynthesis.PUNCT_ALL) {
mAll.toggle();
} else {
mCustom.toggle();
switch (mSettings.getPunctuationLevel()) {
case SpeechSynthesis.PUNCT_ALL:
mAll.toggle();
break;
case SpeechSynthesis.PUNCT_SOME:
mCustom.toggle();
break;
case SpeechSynthesis.PUNCT_NONE:
mNone.toggle();
break;
}
mPunctuationCharacters.setText(mSettings.getPunctuationCharacters());
@@ -107,7 +115,10 @@ public class SpeakPunctuationPreference extends DialogPreference {
if (text != null) {
characters = text.toString();
}
if (characters == null || characters.isEmpty()) {
if (mNone.isChecked()) {
level = SpeechSynthesis.PUNCT_NONE;
} else if (characters == null || characters.isEmpty()) {
level = mAll.isChecked() ? SpeechSynthesis.PUNCT_ALL : SpeechSynthesis.PUNCT_NONE;
} else {
level = mAll.isChecked() ? SpeechSynthesis.PUNCT_ALL : SpeechSynthesis.PUNCT_SOME;