yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DesktopChangeOSD settings are now stored in Script group

Browse source 
The setting whether the osd is shown influences the enabled
state of the script plugin.
This commit is contained in:
Martin Gräßlin 2012-02-25 12:06:30 +01:00
parent 6232f0005e
commit 70f9290fb1
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
kcmkwin/kwindesktop/main.cpp
View file

@ -270,8 +270,9 @@ void KWinDesktopConfig::load()
#endif #endif
// Popup info // Popup info
KConfigGroup popupInfo(m_config, "PopupInfo"); KConfigGroup effectconfig(m_config, "Plugins");
m_ui->popupInfoCheckBox->setChecked(popupInfo.readEntry("ShowPopup", false)); KConfigGroup popupInfo(m_config, "Script-desktopchangeosd");
m_ui->popupInfoCheckBox->setChecked(effectconfig.readEntry("desktopchangeosdEnabled", false));
m_ui->popupHideSpinBox->setValue(popupInfo.readEntry("PopupHideDelay", 1000)); m_ui->popupHideSpinBox->setValue(popupInfo.readEntry("PopupHideDelay", 1000));
m_ui->desktopLayoutIndicatorCheckBox->setChecked(!popupInfo.readEntry("TextOnly", false)); m_ui->desktopLayoutIndicatorCheckBox->setChecked(!popupInfo.readEntry("TextOnly", false));
@ -281,7 +282,6 @@ void KWinDesktopConfig::load()
// Effect for desktop switching // Effect for desktop switching
// Set current option to "none" if no plugin is activated. // Set current option to "none" if no plugin is activated.
KConfigGroup effectconfig(m_config, "Plugins");
m_ui->effectComboBox->setCurrentIndex(0); m_ui->effectComboBox->setCurrentIndex(0);
if (effectEnabled("slide", effectconfig)) if (effectEnabled("slide", effectconfig))
m_ui->effectComboBox->setCurrentIndex(1); m_ui->effectComboBox->setCurrentIndex(1);
@ -345,8 +345,9 @@ void KWinDesktopConfig::save()
#endif #endif
// Popup info // Popup info
KConfigGroup popupInfo(m_config, "PopupInfo"); KConfigGroup effectconfig(m_config, "Plugins");
popupInfo.writeEntry("ShowPopup", m_ui->popupInfoCheckBox->isChecked()); KConfigGroup popupInfo(m_config, "Script-desktopchangeosd");
effectconfig.writeEntry("desktopchangeosdEnabled", m_ui->popupInfoCheckBox->isChecked());
popupInfo.writeEntry("PopupHideDelay", m_ui->popupHideSpinBox->value()); popupInfo.writeEntry("PopupHideDelay", m_ui->popupHideSpinBox->value());
popupInfo.writeEntry("TextOnly", !m_ui->desktopLayoutIndicatorCheckBox->isChecked()); popupInfo.writeEntry("TextOnly", !m_ui->desktopLayoutIndicatorCheckBox->isChecked());
@ -355,7 +356,6 @@ void KWinDesktopConfig::save()
windowConfig.writeEntry("RollOverDesktops", m_ui->wrapAroundBox->isChecked()); windowConfig.writeEntry("RollOverDesktops", m_ui->wrapAroundBox->isChecked());
// Effect desktop switching // Effect desktop switching
KConfigGroup effectconfig(m_config, "Plugins");
int desktopSwitcher = m_ui->effectComboBox->currentIndex(); int desktopSwitcher = m_ui->effectComboBox->currentIndex();
switch(desktopSwitcher) { switch(desktopSwitcher) {
case 0: case 0: