From e903257c4609f3de9e6c59ef1c7dfa557f6877ac Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 7 Sep 2010 21:36:08 +0000
Subject: * Merged in all kdemultimedia bugfix patches from the Chakra project

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1172702 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kmix/kmix.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'kmix/kmix.cpp')

diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp
index 85a3d39e..ce4ab910 100644
--- a/kmix/kmix.cpp
+++ b/kmix/kmix.cpp
@@ -270,6 +270,7 @@ KMixWindow::saveConfig()
       config->writeEntry( "Orientation","Vertical" );
    else
       config->writeEntry( "Orientation","Horizontal" );
+   config->writeEntry( "Autostart", m_autoStart );
 
    // save mixer widgets
    for ( KMixerWidget *mw = m_mixerWidgets.first(); mw != 0; mw = m_mixerWidgets.next() )
@@ -321,6 +322,7 @@ KMixWindow::loadConfig()
        m_toplevelOrientation  = Qt::Vertical;
    else
        m_toplevelOrientation = Qt::Horizontal;
+   m_autoStart = config->readBoolEntry("Autostart", true);
 
    // show/hide menu bar
    m_showMenubar = config->readBoolEntry("Menubar", true);
@@ -436,6 +438,7 @@ KMixWindow::showSettings()
       m_prefDlg->_rbNone->setChecked( m_valueStyle == MixDeviceWidget::NNONE );
       m_prefDlg->_rbAbsolute->setChecked( m_valueStyle == MixDeviceWidget::NABSOLUTE );
       m_prefDlg->_rbRelative->setChecked( m_valueStyle == MixDeviceWidget::NRELATIVE );
+      m_prefDlg->m_autoStartChk->setChecked( m_autoStart );
 
       m_prefDlg->show();
    }
@@ -526,6 +529,7 @@ KMixWindow::applyPrefs( KMixPrefDlg *prefDlg )
      //kdDebug(67100) << "KMix should change to Horizontal layout\n";
      m_toplevelOrientation = Qt::Horizontal;
    }
+   m_autoStart = prefDlg->m_autoStartChk->isChecked();
 
 
    this->setUpdatesEnabled(false);
-- 
cgit v1.2.1