Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-24 02:42:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kwin: remove now obsolete coverswitch configuration options

Browse source
This commit is contained in:
Ivailo Monev 2015-01-14 15:24:36 +00:00
parent be48cb2424
commit fa28f20cd3
1 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
kwin/kcmkwin/kwintabbox/main.cpp
View file

@ -156,11 +156,7 @@ void KWinTabBoxConfig::initLayoutLists()
// TODO: way to recognize if a effect is not found // TODO: way to recognize if a effect is not found
KServiceTypeTrader* trader = KServiceTypeTrader::self(); KServiceTypeTrader* trader = KServiceTypeTrader::self();
KService::List services; KService::List services;
QString coverswitch;
QString flipswitch; QString flipswitch;
services = trader->query("KWin/Effect", "[X-KDE-PluginInfo-Name] == 'kwin4_effect_coverswitch'");
if (!services.isEmpty())
coverswitch = services.first()->name();
services = trader->query("KWin/Effect", "[X-KDE-PluginInfo-Name] == 'kwin4_effect_flipswitch'"); services = trader->query("KWin/Effect", "[X-KDE-PluginInfo-Name] == 'kwin4_effect_flipswitch'");
if (!services.isEmpty()) if (!services.isEmpty())
flipswitch = services.first()->name(); flipswitch = services.first()->name();
@ -191,7 +187,6 @@ void KWinTabBoxConfig::initLayoutLists()
int index = ui[i]->effectCombo->currentIndex(); int index = ui[i]->effectCombo->currentIndex();
QVariant data = ui[i]->effectCombo->itemData(index); QVariant data = ui[i]->effectCombo->itemData(index);
ui[i]->effectCombo->clear(); ui[i]->effectCombo->clear();
ui[i]->effectCombo->addItem(coverswitch);
ui[i]->effectCombo->addItem(flipswitch); ui[i]->effectCombo->addItem(flipswitch);
for (int j = 0; j < layoutNames.count(); ++j) { for (int j = 0; j < layoutNames.count(); ++j) {
ui[i]->effectCombo->addItem(layoutNames[j], layoutPlugins[j]); ui[i]->effectCombo->addItem(layoutNames[j], layoutPlugins[j]);
@ -220,9 +215,7 @@ void KWinTabBoxConfig::load()
updateUiFromConfig(ui[i], *(tabBoxConfig[i])); updateUiFromConfig(ui[i], *(tabBoxConfig[i]));
KConfigGroup effectconfig(m_config, "Plugins"); KConfigGroup effectconfig(m_config, "Plugins");
if (effectEnabled("coverswitch", effectconfig) && KConfigGroup(m_config, "Effect-CoverSwitch").readEntry(group[i], false)) if (effectEnabled("flipswitch", effectconfig) && KConfigGroup(m_config, "Effect-FlipSwitch").readEntry(group[i], false))
ui[i]->effectCombo->setCurrentIndex(CoverSwitch);
else if (effectEnabled("flipswitch", effectconfig) && KConfigGroup(m_config, "Effect-FlipSwitch").readEntry(group[i], false))
ui[i]->effectCombo->setCurrentIndex(FlipSwitch); ui[i]->effectCombo->setCurrentIndex(FlipSwitch);
QString action; QString action;
@ -297,28 +290,18 @@ void KWinTabBoxConfig::save()
// effects // effects
bool highlightWindows = m_primaryTabBoxUi->highlightWindowCheck->isChecked() || bool highlightWindows = m_primaryTabBoxUi->highlightWindowCheck->isChecked() ||
m_alternativeTabBoxUi->highlightWindowCheck->isChecked(); m_alternativeTabBoxUi->highlightWindowCheck->isChecked();
const bool coverSwitch = m_primaryTabBoxUi->showTabBox->isChecked() &&
m_primaryTabBoxUi->effectCombo->currentIndex() == CoverSwitch;
const bool flipSwitch = m_primaryTabBoxUi->showTabBox->isChecked() && const bool flipSwitch = m_primaryTabBoxUi->showTabBox->isChecked() &&
m_primaryTabBoxUi->effectCombo->currentIndex() == FlipSwitch; m_primaryTabBoxUi->effectCombo->currentIndex() == FlipSwitch;
const bool coverSwitchAlternative = m_alternativeTabBoxUi->showTabBox->isChecked() &&
m_alternativeTabBoxUi->effectCombo->currentIndex() == CoverSwitch;
const bool flipSwitchAlternative = m_alternativeTabBoxUi->showTabBox->isChecked() && const bool flipSwitchAlternative = m_alternativeTabBoxUi->showTabBox->isChecked() &&
m_alternativeTabBoxUi->effectCombo->currentIndex() == FlipSwitch; m_alternativeTabBoxUi->effectCombo->currentIndex() == FlipSwitch;
// activate effects if not active // activate effects if not active
KConfigGroup effectconfig(m_config, "Plugins"); KConfigGroup effectconfig(m_config, "Plugins");
if (coverSwitch || coverSwitchAlternative)
effectconfig.writeEntry("kwin4_effect_coverswitchEnabled", true);
if (flipSwitch || flipSwitchAlternative) if (flipSwitch || flipSwitchAlternative)
effectconfig.writeEntry("kwin4_effect_flipswitchEnabled", true); effectconfig.writeEntry("kwin4_effect_flipswitchEnabled", true);
if (highlightWindows) if (highlightWindows)
effectconfig.writeEntry("kwin4_effect_highlightwindowEnabled", true); effectconfig.writeEntry("kwin4_effect_highlightwindowEnabled", true);
effectconfig.sync(); effectconfig.sync();
KConfigGroup coverswitchconfig(m_config, "Effect-CoverSwitch");
coverswitchconfig.writeEntry("TabBox", coverSwitch);
coverswitchconfig.writeEntry("TabBoxAlternative", coverSwitchAlternative);
coverswitchconfig.sync();
KConfigGroup flipswitchconfig(m_config, "Effect-FlipSwitch"); KConfigGroup flipswitchconfig(m_config, "Effect-FlipSwitch");
flipswitchconfig.writeEntry("TabBox", flipSwitch); flipswitchconfig.writeEntry("TabBox", flipSwitch);
flipswitchconfig.writeEntry("TabBoxAlternative", flipSwitchAlternative); flipswitchconfig.writeEntry("TabBoxAlternative", flipSwitchAlternative);
@ -485,7 +468,7 @@ void KWinTabBoxConfig::configureEffectClicked()
QPointer< KDialog > configDialog = new KDialog(this); QPointer< KDialog > configDialog = new KDialog(this);
configDialog->setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Default); configDialog->setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Default);
configDialog->setWindowTitle(ui->effectCombo->currentText()); configDialog->setWindowTitle(ui->effectCombo->currentText());
KCModuleProxy* proxy = new KCModuleProxy(effect == CoverSwitch ? "coverswitch_config" : "flipswitch_config"); KCModuleProxy* proxy = new KCModuleProxy("flipswitch_config");
connect(configDialog, SIGNAL(defaultClicked()), proxy, SLOT(defaults())); connect(configDialog, SIGNAL(defaultClicked()), proxy, SLOT(defaults()));
QWidget *showWidget = new QWidget(configDialog); QWidget *showWidget = new QWidget(configDialog);