diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-12-15 20:31:18 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-12-15 20:31:18 +0000 |
| commit | b00800d31c59fc4dc0028143bef4392af3a7fc55 (patch) | |
| tree | e72cd3c44ad259760b87350750ce4b287d465189 /kmix/kmix.cpp | |
| parent | e2de64d6f1beb9e492daf5b886e19933c1fa41dd (diff) | |
| download | tdemultimedia-b00800d31c59fc4dc0028143bef4392af3a7fc55.tar.gz tdemultimedia-b00800d31c59fc4dc0028143bef4392af3a7fc55.zip | |
* libtunepimp updates
* kmix fixes
* noatun automake patch
* juk configuration dialog enhancements
* hide aRTS menu entries
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1062736 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmix/kmix.cpp')
| -rw-r--r-- | kmix/kmix.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kmix/kmix.cpp b/kmix/kmix.cpp index e4cd68be..1aa97522 100644 --- a/kmix/kmix.cpp +++ b/kmix/kmix.cpp @@ -197,7 +197,7 @@ KMixWindow::updateDocking() // create dock widget // !! This should be a View in the future - m_dockWidget = new KMixDockWidget( Mixer::mixers().first(), this, "mainDockWidget", m_volumeWidget ); + m_dockWidget = new KMixDockWidget( Mixer::mixers().first(), this, "mainDockWidget", m_volumeWidget, m_dockIconMuting ); /* Belongs in KMixDockWidget // create RMB menu @@ -249,6 +249,7 @@ KMixWindow::saveConfig() config->writeEntry( "Tickmarks", m_showTicks ); config->writeEntry( "Labels", m_showLabels ); config->writeEntry( "startkdeRestore", m_onLogin ); + config->writeEntry( "DockIconMuting", m_dockIconMuting ); Mixer* mixerMasterCard = Mixer::masterCard(); if ( mixerMasterCard != 0 ) { config->writeEntry( "MasterMixer", mixerMasterCard->id() ); @@ -298,6 +299,7 @@ KMixWindow::loadConfig() m_showLabels = config->readBoolEntry("Labels", true); const QString& valueStyleString = config->readEntry("ValueStyle", "None"); m_onLogin = config->readBoolEntry("startkdeRestore", true ); + m_dockIconMuting = config->readBoolEntry( "DockIconMuting", false); m_startVisible = config->readBoolEntry("Visible", true); m_multiDriverMode = config->readBoolEntry("MultiDriver", false); m_surroundView = config->readBoolEntry("Experimental-ViewSurround", false ); @@ -428,6 +430,7 @@ KMixWindow::showSettings() m_prefDlg->m_showTicks->setChecked( m_showTicks ); m_prefDlg->m_showLabels->setChecked( m_showLabels ); m_prefDlg->m_onLogin->setChecked( m_onLogin ); + m_prefDlg->m_dockIconMuting->setChecked( m_dockIconMuting ); m_prefDlg->_rbVertical ->setChecked( m_toplevelOrientation == Qt::Vertical ); m_prefDlg->_rbHorizontal->setChecked( m_toplevelOrientation == Qt::Horizontal ); m_prefDlg->_rbNone->setChecked( m_valueStyle == MixDeviceWidget::NNONE ); @@ -497,6 +500,7 @@ KMixWindow::applyPrefs( KMixPrefDlg *prefDlg ) m_showTicks = prefDlg->m_showTicks->isChecked(); m_showLabels = prefDlg->m_showLabels->isChecked(); m_onLogin = prefDlg->m_onLogin->isChecked(); + m_dockIconMuting = prefDlg->m_dockIconMuting->isChecked(); if ( prefDlg->_rbNone->isChecked() ) { m_valueStyle = MixDeviceWidget::NNONE; |