[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdebase/khotkeys/kcontrol
From:       Olivier Goffart <ogoffart () kde ! org>
Date:       2005-08-26 7:40:08
Message-ID: 1125042008.108730.9376.nullmailer () svn ! kde ! org
[Download RAW message or body]

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 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>600</width>
-            <height>480</height>
+            <width>473</width>
+            <height>380</height>
         </rect>
     </property>
     <property name="caption">
@@ -86,10 +86,19 @@
             <property name="sizeHint">
                 <size>
                     <width>31</width>
-                    <height>161</height>
+                    <height>90</height>
                 </size>
             </property>
         </spacer>
+        <widget class="QLabel">
+            <property name="name">
+                <cstring>textLabel1_2</cstring>
+            </property>
+            <property name="text">
+                <string>&lt;b&gt;Note:&lt;/b&gt; To get voice recognition running \
correctly, you need &lt;i&gt;arts&lt;/i&gt; working correctly , and in full duplex \
mode :  +Make sure the &lt;i&gt;full duplex&lt;/i&gt; checkbox of your &lt;i&gt;sound \
server&lt;/i&gt; options is checked.</string> +            </property>
+        </widget>
     </vbox>
 </widget>
 <customwidgets>


[prev in list] [next in list] [prev in thread] [next in thread]