From 89b9872eeff2c77ff09cfb6155ff1663514142e0 Mon Sep 17 00:00:00 2001 From: Rivo Laks Date: Tue, 18 Sep 2007 14:44:03 +0000 Subject: [PATCH] Remove kwineffects config module as it's functionality is now offered by kwincompositing module svn path=/trunk/KDE/kdebase/workspace/; revision=714019 --- kcmkwin/CMakeLists.txt | 3 +- kcmkwin/kwineffects/CMakeLists.txt | 13 --- kcmkwin/kwineffects/Messages.sh | 2 - kcmkwin/kwineffects/kwineffects.desktop | 92 ------------------ kcmkwin/kwineffects/main.cpp | 123 ------------------------ kcmkwin/kwineffects/main.h | 48 --------- workspace.cpp | 2 +- 7 files changed, 2 insertions(+), 281 deletions(-) delete mode 100644 kcmkwin/kwineffects/CMakeLists.txt delete mode 100644 kcmkwin/kwineffects/Messages.sh delete mode 100644 kcmkwin/kwineffects/kwineffects.desktop delete mode 100644 kcmkwin/kwineffects/main.cpp delete mode 100644 kcmkwin/kwineffects/main.h diff --git a/kcmkwin/CMakeLists.txt b/kcmkwin/CMakeLists.txt index 55e55393e8..9396282cd9 100644 --- a/kcmkwin/CMakeLists.txt +++ b/kcmkwin/CMakeLists.txt @@ -2,6 +2,5 @@ add_subdirectory( kwinoptions ) add_subdirectory( kwindecoration ) add_subdirectory( kwinrules ) -add_subdirectory( kwineffects ) -add_subdirectory( kwincompositing ) +add_subdirectory( kwincompositing ) diff --git a/kcmkwin/kwineffects/CMakeLists.txt b/kcmkwin/kwineffects/CMakeLists.txt deleted file mode 100644 index 6f57418f19..0000000000 --- a/kcmkwin/kwineffects/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -########### next target ############### - -set(kcm_kwineffects_PART_SRCS main.cpp ) -kde4_add_plugin(kcm_kwineffects ${kcm_kwineffects_PART_SRCS}) -target_link_libraries(kcm_kwineffects ${KDE4_KUTILS_LIBS}) -install(TARGETS kcm_kwineffects DESTINATION ${PLUGIN_INSTALL_DIR} ) - - -########### install files ############### - -install( FILES kwineffects.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) - - diff --git a/kcmkwin/kwineffects/Messages.sh b/kcmkwin/kwineffects/Messages.sh deleted file mode 100644 index b1e11178e8..0000000000 --- a/kcmkwin/kwineffects/Messages.sh +++ /dev/null @@ -1,2 +0,0 @@ -#! /usr/bin/env bash -$XGETTEXT *.cpp -o $podir/kcmkwineffects.pot diff --git a/kcmkwin/kwineffects/kwineffects.desktop b/kcmkwin/kwineffects/kwineffects.desktop deleted file mode 100644 index 93b57a7950..0000000000 --- a/kcmkwin/kwineffects/kwineffects.desktop +++ /dev/null @@ -1,92 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Exec=kcmshell kwineffects -Icon=preferences-system-windows-effects -Type=Service -ServiceTypes=KCModule -DocPath=kcontrol/kwineffects/index.html - -X-KDE-Library=kcm_kwineffects -X-KDE-ParentApp=kcontrol - -X-KDE-System-Settings-Parent-Category=window-behaviour - -Name=Window Effects -Name[ar]=تأثيرات النافذة -Name[be]=Эфекты вокнаў -Name[bg]=Декорация -Name[csb]=Efektë òknów -Name[de]=Fenstereffekte -Name[el]=Εφέ παραθύρων -Name[es]=Efectos de las ventanas -Name[fa]=جلوه‌های پنجره -Name[ga]=Maisíochtaí Fuinneoige -Name[he]=אפקטי חלונות -Name[it]=Effetti per le finestre -Name[ja]=ウィンドウの効果 -Name[kk]=Терезе эффекттері -Name[km]=បែបផែន​បង្អួច​ -Name[nb]=Vinduseffekter -Name[nds]=Finstereffekten -Name[ne]=सञ्झ्याल प्रभाव -Name[nl]=Venstereffecten -Name[pa]=ਝਰੋਖਾ ਪਰਭਾਵ -Name[pt]=Efeitos das Janelas -Name[pt_BR]=Efeitos de Janela -Name[sl]=Učinki oken -Name[sv]=Fönstereffekt -Name[uk]=Ефекти вікон -Name[vi]=Hiệu ứng Cửa sổ -Name[zh_TW]=視窗效果 - -Comment=Configure window effects -Comment[ar]=إعداد تأثيرات النافذة -Comment[be]=Настаўленні эфектаў вокнаў -Comment[bg]=Настройване активирането на прозорците -Comment[csb]=Kònfigùracëjô efektów òknów -Comment[de]=Fenstereffekte einrichten -Comment[el]=Ρύθμιση εφέ των παραθύρων -Comment[es]=Configurar los efectos de las ventanas -Comment[fa]=پیکربندی جلوه‌های پنجره -Comment[ga]=Cumraigh maisíochtaí fuinneoige -Comment[he]=שינוי הגדרות אפקטי חלונות -Comment[it]=Configura gli effetti per le finestre -Comment[ja]=ウィンドウの効果を設定 -Comment[kk]=Терезе эффектерін баптау -Comment[km]=កំណត់​រចនាសម្ព័ន្ធបែប​ផែ​ន​បង្អួច​ -Comment[nb]=Tilpass vinduseffekter -Comment[nds]=Finstereffekten instellen -Comment[ne]=सञ्झ्याल प्रभाव कन्फिगर गर्नुहोस् -Comment[nl]=Venstereffecten instellen -Comment[pa]=ਝਰੋਖਾ ਪਰਭਾਵ ਸੰਰਚਨਾ -Comment[pt]=Configuração dos efeitos das janelas -Comment[pt_BR]=Configurar efeitos de janelas -Comment[sl]=Nastavi učinke oken -Comment[sv]=Anpassa fönstereffekter -Comment[vi]=Cấu hình các hiệu ứng cửa sổ -Comment[zh_TW]=設定視窗效果 - -Keywords=kwin,window,manager,effect -Keywords[bg]=kwin,window,manager,effect,прозорец,мениджър,ефект -Keywords[csb]=kwin,òkno,menadżer,efekt -Keywords[de]=kwin,fenster,manager,effekt,verwaltung -Keywords[el]=παράθυρο,διαχειριστής,εφέ,kwin,παράθυρο,διαχειριστής,εφέ -Keywords[es]=kwin,ventana,gestor,efecto -Keywords[fa]=kwin، پنجره، مدیر، جلوه -Keywords[ga]=kwin,fuinneog,bainisteoir,maisíocht -Keywords[he]=kwin,window,manager,effect,מנהל,חלונות,אפקט -Keywords[it]=kwin,window,manager,effect,finestra,effetto,effetti -Keywords[ja]=kwin,ウィンドウ、マネージャ,効果,エフェクト -Keywords[km]=kwin បង្អួច​ កម្មវិធី​គ្រប់គ្រង បែបផែន -Keywords[nb]=kwin,vindu,vindusstyring,effekt -Keywords[nds]=kwin,Finster,Pleger,Effekt -Keywords[ne]=केडीई विन, सञ्झ्याल, प्रबन्धक, प्रभाव -Keywords[nl]=kwin,window,venster,window manager,effect -Keywords[pa]=kwin,ਵਿੰਡੋ,ਮੈਨੇਜਰ,ਪਰਭਾਵ -Keywords[pt]=kwin,janela,gestor,efeito -Keywords[pt_BR]=kwin,janela,gerenciador,efeito -Keywords[sv]=kwin,fönster,hantera,effekt -Keywords[vi]=kwin,cửa sổ,quản lý,hiệu ứng - -Categories=Qt;KDE;X-KDE-settings-looknfeel; - diff --git a/kcmkwin/kwineffects/main.cpp b/kcmkwin/kwineffects/main.cpp deleted file mode 100644 index 6edc15a4de..0000000000 --- a/kcmkwin/kwineffects/main.cpp +++ /dev/null @@ -1,123 +0,0 @@ -/***************************************************************** - KWin - the KDE window manager - This file is part of the KDE project. - -Copyright (C) 2007 Rivo Laks - -You can Freely distribute this program under the GNU General Public -License. See the file "COPYING" for the exact licensing terms. -******************************************************************/ - -#include "main.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -K_PLUGIN_FACTORY(KWinEffectsConfigFactory, - registerPlugin(); - ) -K_EXPORT_PLUGIN(KWinEffectsConfigFactory("kcmkwineffects")) - - -namespace KWin -{ - - -KWinEffectsConfig::KWinEffectsConfig(QWidget *parent, const QVariantList &) - : KCModule( KWinEffectsConfigFactory::componentData(), parent), - mKWinConfig(KSharedConfig::openConfig("kwinrc")) -{ - mPluginSelector = new KPluginSelector(this); - QHBoxLayout* layout = new QHBoxLayout; - layout->setMargin(0); - layout->addWidget(mPluginSelector); - setLayout(layout); - - connect(mPluginSelector, SIGNAL(changed(bool)), this, SLOT(changed())); - connect(mPluginSelector, SIGNAL(configCommitted(const QByteArray&)), - this, SLOT(reparseConfiguration(const QByteArray&))); - - // Find all .desktop files of the effects - KService::List offers = KServiceTypeTrader::self()->query("KWin/Effect"); - QList effectinfos = KPluginInfo::fromServices(offers); - - // Add them to the plugin selector - mPluginSelector->addPlugins(effectinfos, KPluginSelector::ReadConfigFile, i18n("Appearance"), "Appearance", mKWinConfig); - mPluginSelector->addPlugins(effectinfos, KPluginSelector::ReadConfigFile, i18n("Accessibility"), "Accessibility", mKWinConfig); - mPluginSelector->addPlugins(effectinfos, KPluginSelector::ReadConfigFile, i18n("Window Management"), "Window Management", mKWinConfig); - mPluginSelector->addPlugins(effectinfos, KPluginSelector::ReadConfigFile, i18n("Demos"), "Demos", mKWinConfig); - mPluginSelector->addPlugins(effectinfos, KPluginSelector::ReadConfigFile, i18n("Tests"), "Tests", mKWinConfig); - mPluginSelector->addPlugins(effectinfos, KPluginSelector::ReadConfigFile, i18n("Misc"), "Misc", mKWinConfig); - - // Load config - load(); - - KAboutData *about = new KAboutData(I18N_NOOP("kcmkwineffects"), 0, - ki18n("Window Effects Configuration Module"), - 0, KLocalizedString(), KAboutData::License_GPL, ki18n("(c) 2007 Rivo Laks")); - about->addAuthor(ki18n("Rivo Laks"), KLocalizedString(), "rivolaks@hot.ee"); - setAboutData(about); -} - -KWinEffectsConfig::~KWinEffectsConfig() -{ -} - -void KWinEffectsConfig::reparseConfiguration(const QByteArray&conf) -{ - KSettings::Dispatcher::reparseConfiguration(conf); -} - -void KWinEffectsConfig::load() -{ - kDebug() ; - mKWinConfig->reparseConfiguration(); - - mPluginSelector->load(); - - emit changed( false ); -} - - -void KWinEffectsConfig::save() -{ - kDebug() ; - - mPluginSelector->save(); - - emit changed( false ); - - // Send signal to kwin - mKWinConfig->sync(); - // Send signal to all kwin instances - QDBusMessage message = QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig"); - QDBusConnection::sessionBus().send(message); -} - - -void KWinEffectsConfig::defaults() -{ - kDebug() ; - mPluginSelector->defaults(); -} - -QString KWinEffectsConfig::quickHelp() const -{ - kDebug() ; - return i18n("

Window Effects

Here you can configure which effects will be used."); -} - -} // namespace - -#include "main.moc" diff --git a/kcmkwin/kwineffects/main.h b/kcmkwin/kwineffects/main.h deleted file mode 100644 index eded4cd684..0000000000 --- a/kcmkwin/kwineffects/main.h +++ /dev/null @@ -1,48 +0,0 @@ -/***************************************************************** - KWin - the KDE window manager - This file is part of the KDE project. - -Copyright (C) 2007 Rivo Laks - -You can Freely distribute this program under the GNU General Public -License. See the file "COPYING" for the exact licensing terms. -******************************************************************/ - - -#ifndef __MAIN_H__ -#define __MAIN_H__ - -#include - -#include -#include -#include - -class KPluginSelector; - -namespace KWin -{ - -class KWinEffectsConfig : public KCModule - { - Q_OBJECT - public: - KWinEffectsConfig(QWidget *parent, const QVariantList &args); - virtual ~KWinEffectsConfig(); - - virtual QString quickHelp() const; - - public slots: - virtual void load(); - virtual void save(); - virtual void defaults(); - void reparseConfiguration(const QByteArray&conf); - - private: - KSharedConfigPtr mKWinConfig; - KPluginSelector* mPluginSelector; - }; - -} // namespace - -#endif diff --git a/workspace.cpp b/workspace.cpp index aa57609616..d1dd80a1fa 100644 --- a/workspace.cpp +++ b/workspace.cpp @@ -1119,7 +1119,7 @@ QStringList Workspace::configModules(bool controlCenter) if (controlCenter) args << "kwinoptions"; else if (KAuthorized::authorizeControlModule("kde-kwinoptions.desktop")) - args << "kwinactions" << "kwinfocus" << "kwinmoving" << "kwinadvanced" << "kwinrules" << "kwincompositing" << "kwineffects"; + args << "kwinactions" << "kwinfocus" << "kwinmoving" << "kwinadvanced" << "kwinrules" << "kwincompositing"; return args; }