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

List:       kde-commits
Subject:    branches/marble/marble-1.1/src/plugins/render/routing
From:       Dennis Nienhüser <earthwings () gentoo ! org>
Date:       2011-03-09 20:32:15
Message-ID: 20110309203215.D6DBBAC8C4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1224260 by nienhueser:

Make sound output the default instead of voice navigation - so far we don't have a default voice to ship.
Backport of commit 1224258.

 M  +1 -1      AudioOutput.cpp  
 M  +4 -1      RoutingConfigDialog.ui  
 M  +10 -1     RoutingPlugin.cpp  


--- branches/marble/marble-1.1/src/plugins/render/routing/AudioOutput.cpp #1224259:1224260
@@ -64,7 +64,7 @@
 
 AudioOutputPrivate::AudioOutputPrivate( AudioOutput* parent ) :
     q( parent ), m_output( 0 ), m_lastIndex( -1 ),
-    m_lastDistance( 0.0 ), m_muted( false ), m_soundEnabled( false )
+    m_lastDistance( 0.0 ), m_muted( false ), m_soundEnabled( true )
 {
     // nothing to do
 }
--- branches/marble/marble-1.1/src/plugins/render/routing/RoutingConfigDialog.ui #1224259:1224260
@@ -49,6 +49,9 @@
          <property name="text">
           <string>Play a sound</string>
          </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item>
@@ -59,7 +62,7 @@
             <string>Use this speaker</string>
            </property>
            <property name="checked">
-            <bool>true</bool>
+            <bool>false</bool>
            </property>
           </widget>
          </item>
--- branches/marble/marble-1.1/src/plugins/render/routing/RoutingPlugin.cpp #1224259:1224260
@@ -107,7 +107,9 @@
     m_configDialog( 0 ),
     m_parent( parent )
 {
-    // nothing to do
+    m_settings["muted"] = false;
+    m_settings["sound"] = true;
+    m_settings["speaker"] = QString();
 }
 
 QString RoutingPluginPrivate::richText( const QString &source, int size ) const
@@ -370,6 +372,7 @@
         m_configUi.speakerComboBox->setCurrentIndex( index );
         m_configUi.voiceNavigationCheckBox->setChecked( !muted );
         m_configUi.soundRadioButton->setChecked( sound );
+        m_configUi.speakerRadioButton->setChecked( !sound );
     }
 }
 
@@ -507,6 +510,12 @@
 void RoutingPlugin::setSettings( QHash<QString,QVariant> settings )
 {
     d->m_settings = settings;
+    if (!d->m_settings.contains("muted")) {
+        d->m_settings["muted"] = false;
+    }
+    if (!d->m_settings.contains("sound")) {
+        d->m_settings["sound"] = true;
+    }
     d->readSettings();
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]