SVN commit 453432 by ogoffart:
Add a label about arts in the global voice settings page.
Remove all the voice stuff from the GUI if --without-arts
M +10 -2 tab_widget.cpp
M +2 -0 triggers_tab.cpp
M +12 -3 ui/voice_settings_tab_ui.ui
--- branches/KDE/3.5/kdebase/khotkeys/kcontrol/tab_widget.cpp #453431:453432
@@ -77,7 +77,11 @@
i < TAB_END;
++i )
connect( this, SIGNAL( clear_pages_signal()), pages[ i ], SLOT( clear_data()));
- show_pages(( TAB_INFO, TAB_GENERAL_SETTINGS, TAB_GESTURES_SETTINGS, TAB_VOICE_SETTINGS ));
+ show_pages(( TAB_INFO, TAB_GENERAL_SETTINGS, TAB_GESTURES_SETTINGS
+#ifndef WITHOUT_ARTS
+ , TAB_VOICE_SETTINGS
+#endif
+ ));
current_type = NONE;
current_data_type = TYPE_GENERIC;
}
@@ -338,7 +342,11 @@
kdDebug( 1217 ) << "setting none" << endl;
if( current_type == NONE )
return;
- show_pages(( TAB_INFO, TAB_GENERAL_SETTINGS, TAB_GESTURES_SETTINGS, TAB_VOICE_SETTINGS ));
+ show_pages(( TAB_INFO, TAB_GENERAL_SETTINGS, TAB_GESTURES_SETTINGS
+#ifndef WITHOUT_ARTS
+ , TAB_VOICE_SETTINGS
+#endif
+ ));
current_type = NONE;
return;
}
--- branches/KDE/3.5/kdebase/khotkeys/kcontrol/triggers_tab.cpp #453431:453432
@@ -51,7 +51,9 @@
popup->insertItem( i18n( "Shortcut Trigger..." ), TYPE_SHORTCUT_TRIGGER );
popup->insertItem( i18n( "Gesture Trigger..." ), TYPE_GESTURE_TRIGGER );
popup->insertItem( i18n( "Window Trigger..." ), TYPE_WINDOW_TRIGGER );
+#ifndef WITHOUT_ARTS
popup->insertItem( i18n( "Voice Trigger..." ), TYPE_VOICE_TRIGGER );
+#endif
connect( popup, SIGNAL( activated( int )), SLOT( new_selected( int )));
connect( triggers_listview, SIGNAL( doubleClicked ( QListViewItem *, const QPoint &, int ) ),
this, SLOT( modify_pressed() ) );
--- branches/KDE/3.5/kdebase/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui #453431:453432
@@ -8,8 +8,8 @@
0
0
- 600
- 480
+ 473
+ 380
@@ -86,10 +86,19 @@
31
- 161
+ 90
+
+
+ textLabel1_2
+
+
+ <b>Note:</b> To get voice recognition running correctly, you need <i>arts</i> working correctly , and in full duplex mode :
+Make sure the <i>full duplex</i> checkbox of your <i>sound server</i> options is checked.
+
+