diff options
Diffstat (limited to 'kwin/kcmkwin/kwinoptions')
-rw-r--r-- | kwin/kcmkwin/kwinoptions/CMakeLists.txt | 10 | ||||
-rw-r--r-- | kwin/kcmkwin/kwinoptions/Makefile.am | 14 | ||||
-rw-r--r-- | kwin/kcmkwin/kwinoptions/kwinactions.desktop | 6 | ||||
-rw-r--r-- | kwin/kcmkwin/kwinoptions/kwinadvanced.desktop | 6 | ||||
-rw-r--r-- | kwin/kcmkwin/kwinoptions/kwinfocus.desktop | 6 | ||||
-rw-r--r-- | kwin/kcmkwin/kwinoptions/kwinmoving.desktop | 6 | ||||
-rw-r--r-- | kwin/kcmkwin/kwinoptions/kwinoptions.desktop | 6 | ||||
-rw-r--r-- | kwin/kcmkwin/kwinoptions/kwintranslucency.desktop | 6 | ||||
-rw-r--r-- | kwin/kcmkwin/kwinoptions/main.cpp | 46 | ||||
-rw-r--r-- | kwin/kcmkwin/kwinoptions/mouse.cpp | 4 | ||||
-rw-r--r-- | kwin/kcmkwin/kwinoptions/windows.cpp | 18 | ||||
-rw-r--r-- | kwin/kcmkwin/kwinoptions/windows.h | 2 |
12 files changed, 65 insertions, 65 deletions
diff --git a/kwin/kcmkwin/kwinoptions/CMakeLists.txt b/kwin/kcmkwin/kwinoptions/CMakeLists.txt index b3caf6ec0..591883e21 100644 --- a/kwin/kcmkwin/kwinoptions/CMakeLists.txt +++ b/kwin/kcmkwin/kwinoptions/CMakeLists.txt @@ -23,17 +23,17 @@ link_directories( ##### other data ################################ -install( FILES kwinoptions.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES twinoptions.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES - kwinactions.desktop kwinadvanced.desktop kwinfocus.desktop - kwinmoving.desktop kwintranslucency.desktop + twinactions.desktop twinadvanced.desktop twinfocus.desktop + twinmoving.desktop twintranslucency.desktop DESTINATION ${APPS_INSTALL_DIR}/.hidden ) -##### kcm_kwinoptions (module) ################## +##### kcm_twinoptions (module) ################## -tde_add_kpart( kcm_kwinoptions AUTOMOC +tde_add_kpart( kcm_twinoptions AUTOMOC SOURCES windows.cpp mouse.cpp main.cpp LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/kwin/kcmkwin/kwinoptions/Makefile.am b/kwin/kcmkwin/kwinoptions/Makefile.am index 7dd897762..d2b4e6583 100644 --- a/kwin/kcmkwin/kwinoptions/Makefile.am +++ b/kwin/kcmkwin/kwinoptions/Makefile.am @@ -1,18 +1,18 @@ METASOURCES = AUTO INCLUDES = $(all_includes) -kde_module_LTLIBRARIES = kcm_kwinoptions.la +kde_module_LTLIBRARIES = kcm_twinoptions.la -kcm_kwinoptions_la_SOURCES = windows.cpp mouse.cpp main.cpp -kcm_kwinoptions_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined -kcm_kwinoptions_la_LIBADD = $(LIB_TDEUI) +kcm_twinoptions_la_SOURCES = windows.cpp mouse.cpp main.cpp +kcm_twinoptions_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined +kcm_twinoptions_la_LIBADD = $(LIB_TDEUI) noinst_HEADERS = windows.h mouse.h messages: $(XGETTEXT) *.cpp -o $(podir)/kcmkwm.pot -kwin_kcmkwin_options_data_DATA = kwinactions.desktop kwinadvanced.desktop kwinfocus.desktop kwinmoving.desktop kwintranslucency.desktop -kwin_kcmkwin_options_datadir = $(kde_appsdir)/.hidden +twin_kcmtwin_options_data_DATA = twinactions.desktop twinadvanced.desktop twinfocus.desktop twinmoving.desktop twintranslucency.desktop +twin_kcmtwin_options_datadir = $(kde_appsdir)/.hidden -xdg_apps_DATA = kwinoptions.desktop +xdg_apps_DATA = twinoptions.desktop diff --git a/kwin/kcmkwin/kwinoptions/kwinactions.desktop b/kwin/kcmkwin/kwinoptions/kwinactions.desktop index 61b58b06d..8f0b7b0ba 100644 --- a/kwin/kcmkwin/kwinoptions/kwinactions.desktop +++ b/kwin/kcmkwin/kwinoptions/kwinactions.desktop @@ -1,12 +1,12 @@ [Desktop Entry] Icon=kcmkwm Type=Application -Exec=kcmshell kwinactions +Exec=kcmshell twinactions DocPath=kcontrol/windowmanagement/index.html#action-actions X-KDE-ModuleType=Library -X-KDE-Library=kwinoptions -X-KDE-FactoryName=kwinactions +X-KDE-Library=twinoptions +X-KDE-FactoryName=twinactions Name=Actions Name[af]=Aksies diff --git a/kwin/kcmkwin/kwinoptions/kwinadvanced.desktop b/kwin/kcmkwin/kwinoptions/kwinadvanced.desktop index e8b6b52e8..541f93e7f 100644 --- a/kwin/kcmkwin/kwinoptions/kwinadvanced.desktop +++ b/kwin/kcmkwin/kwinoptions/kwinadvanced.desktop @@ -1,12 +1,12 @@ [Desktop Entry] Icon=kcmkwm Type=Application -Exec=kcmshell kwinadvanced +Exec=kcmshell twinadvanced DocPath=kcontrol/windowmanagement/index.html#action-advanced X-KDE-ModuleType=Library -X-KDE-Library=kwinoptions -X-KDE-FactoryName=kwinadvanced +X-KDE-Library=twinoptions +X-KDE-FactoryName=twinadvanced Name=Advanced Name[af]=Gevorderde diff --git a/kwin/kcmkwin/kwinoptions/kwinfocus.desktop b/kwin/kcmkwin/kwinoptions/kwinfocus.desktop index 115463654..541c82501 100644 --- a/kwin/kcmkwin/kwinoptions/kwinfocus.desktop +++ b/kwin/kcmkwin/kwinoptions/kwinfocus.desktop @@ -1,12 +1,12 @@ [Desktop Entry] Icon=kcmkwm Type=Application -Exec=kcmshell kwinfocus +Exec=kcmshell twinfocus DocPath=kcontrol/windowmanagement/index.html#action-focus X-KDE-ModuleType=Library -X-KDE-Library=kwinoptions -X-KDE-FactoryName=kwinfocus +X-KDE-Library=twinoptions +X-KDE-FactoryName=twinfocus Name=Focus Name[af]=Fokus diff --git a/kwin/kcmkwin/kwinoptions/kwinmoving.desktop b/kwin/kcmkwin/kwinoptions/kwinmoving.desktop index 912418e0e..9ba6aec20 100644 --- a/kwin/kcmkwin/kwinoptions/kwinmoving.desktop +++ b/kwin/kcmkwin/kwinoptions/kwinmoving.desktop @@ -1,12 +1,12 @@ [Desktop Entry] Icon=kcmkwm Type=Application -Exec=kcmshell kwinmoving +Exec=kcmshell twinmoving DocPath=kcontrol/windowmanagement/index.html#action-moving X-KDE-ModuleType=Library -X-KDE-Library=kwinoptions -X-KDE-FactoryName=kwinmoving +X-KDE-Library=twinoptions +X-KDE-FactoryName=twinmoving Name=Moving Name[af]=Beweeg diff --git a/kwin/kcmkwin/kwinoptions/kwinoptions.desktop b/kwin/kcmkwin/kwinoptions/kwinoptions.desktop index 23a222197..e520dcc88 100644 --- a/kwin/kcmkwin/kwinoptions/kwinoptions.desktop +++ b/kwin/kcmkwin/kwinoptions/kwinoptions.desktop @@ -1,12 +1,12 @@ [Desktop Entry] Icon=kcmkwm Type=Application -Exec=kcmshell kwinoptions +Exec=kcmshell twinoptions DocPath=kcontrol/windowmanagement/index.html X-KDE-ModuleType=Library -X-KDE-Library=kwinoptions -X-KDE-FactoryName=kwinoptions +X-KDE-Library=twinoptions +X-KDE-FactoryName=twinoptions Name=Window Behavior Name[af]=Venster Gedrag diff --git a/kwin/kcmkwin/kwinoptions/kwintranslucency.desktop b/kwin/kcmkwin/kwinoptions/kwintranslucency.desktop index e45e5928a..591cab231 100644 --- a/kwin/kcmkwin/kwinoptions/kwintranslucency.desktop +++ b/kwin/kcmkwin/kwinoptions/kwintranslucency.desktop @@ -1,12 +1,12 @@ [Desktop Entry] Icon=kcmkwm Type=Application -Exec=kcmshell kwintranslucency +Exec=kcmshell twintranslucency DocPath=kcontrol/windowmanagement/index.html#action-translucency X-KDE-ModuleType=Library -X-KDE-Library=kwinoptions -X-KDE-FactoryName=kwintranslucency +X-KDE-Library=twinoptions +X-KDE-FactoryName=twintranslucency Name=Translucency Name[af]=Deursigtigheid diff --git a/kwin/kcmkwin/kwinoptions/main.cpp b/kwin/kcmkwin/kwinoptions/main.cpp index 8c8a283f2..a10269eca 100644 --- a/kwin/kcmkwin/kwinoptions/main.cpp +++ b/kwin/kcmkwin/kwinoptions/main.cpp @@ -36,48 +36,48 @@ extern "C" { - KDE_EXPORT KCModule *create_kwinfocus(TQWidget *parent, const char *name) + KDE_EXPORT KCModule *create_twinfocus(TQWidget *parent, const char *name) { - //CT there's need for decision: kwm or kwin? + //CT there's need for decision: kwm or twin? KGlobal::locale()->insertCatalogue("kcmkwm"); - KConfig *c = new KConfig("kwinrc", false, true); + KConfig *c = new KConfig("twinrc", false, true); return new KFocusConfig(true, c, parent, name); } - KDE_EXPORT KCModule *create_kwinactions(TQWidget *parent, const char *name) + KDE_EXPORT KCModule *create_twinactions(TQWidget *parent, const char *name) { - //CT there's need for decision: kwm or kwin? + //CT there's need for decision: kwm or twin? KGlobal::locale()->insertCatalogue("kcmkwm"); return new KActionsOptions( parent, name); } - KDE_EXPORT KCModule *create_kwinmoving(TQWidget *parent, const char *name) + KDE_EXPORT KCModule *create_twinmoving(TQWidget *parent, const char *name) { - //CT there's need for decision: kwm or kwin? + //CT there's need for decision: kwm or twin? KGlobal::locale()->insertCatalogue("kcmkwm"); - KConfig *c = new KConfig("kwinrc", false, true); + KConfig *c = new KConfig("twinrc", false, true); return new KMovingConfig(true, c, parent, name); } - KDE_EXPORT KCModule *create_kwinadvanced(TQWidget *parent, const char *name) + KDE_EXPORT KCModule *create_twinadvanced(TQWidget *parent, const char *name) { - //CT there's need for decision: kwm or kwin? + //CT there's need for decision: kwm or twin? KGlobal::locale()->insertCatalogue("kcmkwm"); - KConfig *c = new KConfig("kwinrc", false, true); + KConfig *c = new KConfig("twinrc", false, true); return new KAdvancedConfig(true, c, parent, name); } - KDE_EXPORT KCModule *create_kwintranslucency(TQWidget *parent, const char *name) + KDE_EXPORT KCModule *create_twintranslucency(TQWidget *parent, const char *name) { - //CT there's need for decision: kwm or kwin? + //CT there's need for decision: kwm or twin? KGlobal::locale()->insertCatalogue("kcmkwm"); - KConfig *c = new KConfig("kwinrc", false, true); + KConfig *c = new KConfig("twinrc", false, true); return new KTranslucencyConfig(true, c, parent, name); } - KDE_EXPORT KCModule *create_kwinoptions ( TQWidget *parent, const char* name) + KDE_EXPORT KCModule *create_twinoptions ( TQWidget *parent, const char* name) { - //CT there's need for decision: kwm or kwin? + //CT there's need for decision: kwm or twin? KGlobal::locale()->insertCatalogue("kcmkwm"); return new KWinOptions( parent, name); } @@ -86,7 +86,7 @@ extern "C" KWinOptions::KWinOptions(TQWidget *parent, const char *name) : KCModule(parent, name) { - mConfig = new KConfig("kwinrc", false, true); + mConfig = new KConfig("twinrc", false, true); TQVBoxLayout *layout = new TQVBoxLayout(this); tab = new TQTabWidget(this); @@ -123,7 +123,7 @@ KWinOptions::KWinOptions(TQWidget *parent, const char *name) connect(mTranslucency, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool))); KAboutData *about = - new KAboutData(I18N_NOOP("kcmkwinoptions"), I18N_NOOP("Window Behavior Configuration Module"), + new KAboutData(I18N_NOOP("kcmtwinoptions"), I18N_NOOP("Window Behavior Configuration Module"), 0, 0, KAboutData::License_GPL, I18N_NOOP("(c) 1997 - 2002 KWin and KControl Authors")); @@ -167,11 +167,11 @@ void KWinOptions::save() mTranslucency->save(); emit KCModule::changed( false ); - // Send signal to kwin + // Send signal to twin mConfig->sync(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); + kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); } @@ -204,7 +204,7 @@ void KWinOptions::moduleChanged(bool state) KActionsOptions::KActionsOptions(TQWidget *parent, const char *name) : KCModule(parent, name) { - mConfig = new KConfig("kwinrc", false, true); + mConfig = new KConfig("twinrc", false, true); TQVBoxLayout *layout = new TQVBoxLayout(this); tab = new TQTabWidget(this); @@ -240,11 +240,11 @@ void KActionsOptions::save() mWindowActions->save(); emit KCModule::changed( false ); - // Send signal to kwin + // Send signal to twin mConfig->sync(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); + kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); } diff --git a/kwin/kcmkwin/kwinoptions/mouse.cpp b/kwin/kcmkwin/kwinoptions/mouse.cpp index 30c18383c..30692d87f 100644 --- a/kwin/kcmkwin/kwinoptions/mouse.cpp +++ b/kwin/kcmkwin/kwinoptions/mouse.cpp @@ -565,7 +565,7 @@ void KTitleBarActionsConfig::save() config->sync(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); + kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); } } @@ -839,7 +839,7 @@ void KWindowActionsConfig::save() config->sync(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); + kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); } } diff --git a/kwin/kcmkwin/kwinoptions/windows.cpp b/kwin/kcmkwin/kwinoptions/windows.cpp index 30d0791e8..80185a427 100644 --- a/kwin/kcmkwin/kwinoptions/windows.cpp +++ b/kwin/kcmkwin/kwinoptions/windows.cpp @@ -53,7 +53,7 @@ #include "windows.h" -// kwin config keywords +// twin config keywords #define KWIN_FOCUS "FocusPolicy" #define KWIN_PLACEMENT "Placement" #define KWIN_MOVE "MoveMode" @@ -535,7 +535,7 @@ void KFocusConfig::save( void ) config->sync(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); + kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); } emit KCModule::changed(false); } @@ -762,7 +762,7 @@ void KAdvancedConfig::save( void ) config->sync(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); + kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); } emit KCModule::changed(false); } @@ -907,7 +907,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, KConfig *_config, TQWidget *pare placementCombo->insertItem(i18n("Random"), RANDOM_PLACEMENT); placementCombo->insertItem(i18n("Centered"), CENTERED_PLACEMENT); placementCombo->insertItem(i18n("Zero-Cornered"), ZEROCORNERED_PLACEMENT); - // CT: disabling is needed as long as functionality misses in kwin + // CT: disabling is needed as long as functionality misses in twin //placementCombo->insertItem(i18n("Interactive"), INTERACTIVE_PLACEMENT); //placementCombo->insertItem(i18n("Manual"), MANUAL_PLACEMENT); placementCombo->setCurrentItem(SMART_PLACEMENT); @@ -1098,7 +1098,7 @@ void KMovingConfig::load( void ) setMinimizeAnim( anim ); setMinimizeAnimSpeed( animSpeed ); - // DF: please keep the default consistent with kwin (options.cpp line 145) + // DF: please keep the default consistent with twin (options.cpp line 145) key = config->readEntry(KWIN_RESIZE_OPAQUE, "Opaque"); if( key == "Opaque") setResizeOpaque(RESIZE_OPAQUE); @@ -1219,7 +1219,7 @@ void KMovingConfig::save( void ) config->sync(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); + kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); } emit KCModule::changed(false); } @@ -1232,7 +1232,7 @@ void KMovingConfig::defaults() setPlacement(SMART_PLACEMENT); setMoveResizeMaximized(false); - //copied from kcontrol/konq/kwindesktop, aleXXX + //copied from kcontrol/konq/twindesktop, aleXXX setWindowSnapZone(KWM_WNDW_SNAP_ZONE_DEFAULT); setBorderSnapZone(KWM_BRDR_SNAP_ZONE_DEFAULT); OverlapSnap->setChecked(false); @@ -1277,7 +1277,7 @@ KTranslucencyConfig::KTranslucencyConfig (bool _standAlone, KConfig *_config, TQ KActiveLabel *label = new KActiveLabel(i18n("<qt><b>It seems that alpha channel support is not available.</b><br><br>" "Please make sure you have " "<a href=\"http://www.freedesktop.org/\">Xorg ≥ 6.8</a>," - " and installed the kompmgr that came with kwin.<br>" + " and installed the kompmgr that came with twin.<br>" "Also, make sure you have the following entries in your XConfig (e.g. /etc/X11/xorg.conf):<br><br>" "<i>Section \"Extensions\"<br>" "Option \"Composite\" \"Enable\"<br>" @@ -1636,7 +1636,7 @@ void KTranslucencyConfig::save( void ) config->sync(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); + kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); } if (useTranslucency->isChecked()) startKompmgr(); diff --git a/kwin/kcmkwin/kwinoptions/windows.h b/kwin/kcmkwin/kwinoptions/windows.h index 57ac7163e..e3b81d07a 100644 --- a/kwin/kcmkwin/kwinoptions/windows.h +++ b/kwin/kcmkwin/kwinoptions/windows.h @@ -200,7 +200,7 @@ public: private slots: void shadeHoverChanged(bool); - //copied from kcontrol/konq/kwindesktop, aleXXX + //copied from kcontrol/konq/twindesktop, aleXXX void setEBorders(); void changed() { emit KCModule::changed(true); } |