diff options
Diffstat (limited to 'kwin/data')
-rw-r--r-- | kwin/data/CMakeLists.txt | 20 | ||||
-rw-r--r-- | kwin/data/Makefile.am | 24 | ||||
-rw-r--r-- | kwin/data/kwin.upd | 4 | ||||
-rw-r--r-- | kwin/data/kwin3_plugin.pl | 4 | ||||
-rw-r--r-- | kwin/data/kwin3_plugin.upd | 4 | ||||
-rw-r--r-- | kwin/data/kwin_focus1.upd | 6 | ||||
-rw-r--r-- | kwin/data/kwin_focus2.upd | 6 | ||||
-rw-r--r-- | kwin/data/kwin_fsp_workarounds_1.upd | 10 | ||||
-rw-r--r-- | kwin/data/kwiniconify.upd | 2 | ||||
-rw-r--r-- | kwin/data/kwinsticky.upd | 2 | ||||
-rw-r--r-- | kwin/data/kwinupdatewindowsettings.upd | 8 | ||||
-rwxr-xr-x | kwin/data/pluginlibFix.pl | 4 | ||||
-rw-r--r-- | kwin/data/update_default_rules.cpp | 10 | ||||
-rw-r--r-- | kwin/data/update_window_settings.cpp | 8 |
14 files changed, 56 insertions, 56 deletions
diff --git a/kwin/data/CMakeLists.txt b/kwin/data/CMakeLists.txt index 832a71cfd..808d65e06 100644 --- a/kwin/data/CMakeLists.txt +++ b/kwin/data/CMakeLists.txt @@ -22,13 +22,13 @@ link_directories( ##### other data ################################ install( FILES - kwin.upd kwinsticky.upd kwiniconify.upd kwin3_plugin.upd - kwin_focus1.upd kwinupdatewindowsettings.upd - kwin_focus2.upd kwin_fsp_workarounds_1.upd + twin.upd twinsticky.upd twiniconify.upd twin3_plugin.upd + twin_focus1.upd twinupdatewindowsettings.upd + twin_focus2.upd twin_fsp_workarounds_1.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) install( PROGRAMS - pluginlibFix.pl kwin3_plugin.pl kwin_focus1.sh kwin_focus2.sh + pluginlibFix.pl twin3_plugin.pl twin_focus1.sh twin_focus2.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) install( FILES @@ -36,22 +36,22 @@ install( FILES DESTINATION ${SOUND_INSTALL_DIR} ) install( FILES - fsp_workarounds_1.kwinrules - DESTINATION ${DATA_INSTALL_DIR}/kwin/default_rules ) + fsp_workarounds_1.twinrules + DESTINATION ${DATA_INSTALL_DIR}/twin/default_rules ) -##### kwin_update_window_settings (executable) ## +##### twin_update_window_settings (executable) ## -tde_add_executable( kwin_update_window_settings +tde_add_executable( twin_update_window_settings SOURCES update_window_settings.cpp LINK tdecore-shared DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin ) -##### kwin_update_default_rules (executable) #### +##### twin_update_default_rules (executable) #### -tde_add_executable( kwin_update_default_rules +tde_add_executable( twin_update_default_rules SOURCES update_default_rules.cpp LINK tdecore-shared DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin diff --git a/kwin/data/Makefile.am b/kwin/data/Makefile.am index 3ae92fe7a..81bc0db43 100644 --- a/kwin/data/Makefile.am +++ b/kwin/data/Makefile.am @@ -1,13 +1,13 @@ -kconf_PROGRAMS = kwin_update_window_settings kwin_update_default_rules +kconf_PROGRAMS = twin_update_window_settings twin_update_default_rules kconfdir = $(libdir)/kconf_update_bin -kwin_update_window_settings_SOURCES = update_window_settings.cpp -kwin_update_window_settings_LDADD = $(LIB_TDECORE) $(KDE_RPATH) -kwin_update_window_settings_LDFLAGS = $(all_libraries) +twin_update_window_settings_SOURCES = update_window_settings.cpp +twin_update_window_settings_LDADD = $(LIB_TDECORE) $(KDE_RPATH) +twin_update_window_settings_LDFLAGS = $(all_libraries) -kwin_update_default_rules_SOURCES = update_default_rules.cpp -kwin_update_default_rules_LDADD = $(LIB_TDECORE) $(KDE_RPATH) -kwin_update_default_rules_LDFLAGS = $(all_libraries) +twin_update_default_rules_SOURCES = update_default_rules.cpp +twin_update_default_rules_LDADD = $(LIB_TDECORE) $(KDE_RPATH) +twin_update_default_rules_LDFLAGS = $(all_libraries) INCLUDES = $(all_includes) @@ -16,10 +16,10 @@ METASOURCES = AUTO sounddir= $(kde_sounddir) sound_DATA = pop.wav -update_DATA = kwin.upd kwinsticky.upd kwiniconify.upd kwin3_plugin.upd kwin_focus1.upd \ - kwinupdatewindowsettings.upd kwin_focus2.upd kwin_fsp_workarounds_1.upd -update_SCRIPTS = pluginlibFix.pl kwin3_plugin.pl kwin_focus1.sh kwin_focus2.sh +update_DATA = twin.upd twinsticky.upd twiniconify.upd twin3_plugin.upd twin_focus1.upd \ + twinupdatewindowsettings.upd twin_focus2.upd twin_fsp_workarounds_1.upd +update_SCRIPTS = pluginlibFix.pl twin3_plugin.pl twin_focus1.sh twin_focus2.sh updatedir = $(kde_datadir)/kconf_update -kwin_default_rules_DATA = fsp_workarounds_1.kwinrules -kwin_default_rulesdir = $(kde_datadir)/kwin/default_rules +twin_default_rules_DATA = fsp_workarounds_1.twinrules +twin_default_rulesdir = $(kde_datadir)/twin/default_rules diff --git a/kwin/data/kwin.upd b/kwin/data/kwin.upd index 3e8682bfe..802ad5c44 100644 --- a/kwin/data/kwin.upd +++ b/kwin/data/kwin.upd @@ -1,11 +1,11 @@ Id=trinity.0r1 -File=kwinrc +File=twinrc Options=overwrite Script=pluginlibFix.pl,perl # Xinerama fixups Id=trinity.2Xinerama -File=kwinrc,kdeglobals +File=twinrc,kdeglobals Group=Windows Key=XineramaEnabled Key=XineramaMovementEnabled diff --git a/kwin/data/kwin3_plugin.pl b/kwin/data/kwin3_plugin.pl index 791ea7f33..f5234bcce 100644 --- a/kwin/data/kwin3_plugin.pl +++ b/kwin/data/kwin3_plugin.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl foreach (<>) { - if(/^PluginLib=kwin_(.*)$/) { - print "PluginLib=kwin3_$1\n"; + if(/^PluginLib=twin_(.*)$/) { + print "PluginLib=twin3_$1\n"; next; } print $_; diff --git a/kwin/data/kwin3_plugin.upd b/kwin/data/kwin3_plugin.upd index 8b7675543..7194b5641 100644 --- a/kwin/data/kwin3_plugin.upd +++ b/kwin/data/kwin3_plugin.upd @@ -1,4 +1,4 @@ Id=trinity.2 -File=kwinrc +File=twinrc Options=overwrite -Script=kwin3_plugin.pl,perl +Script=twin3_plugin.pl,perl diff --git a/kwin/data/kwin_focus1.upd b/kwin/data/kwin_focus1.upd index 902ac0fad..b7cc384a7 100644 --- a/kwin/data/kwin_focus1.upd +++ b/kwin/data/kwin_focus1.upd @@ -1,5 +1,5 @@ -Id=kwin_focus1 -File=kwinrc +Id=twin_focus1 +File=twinrc Group=Windows Options=overwrite -Script=kwin_focus1.sh,sh +Script=twin_focus1.sh,sh diff --git a/kwin/data/kwin_focus2.upd b/kwin/data/kwin_focus2.upd index 681c2c404..094edd446 100644 --- a/kwin/data/kwin_focus2.upd +++ b/kwin/data/kwin_focus2.upd @@ -1,5 +1,5 @@ -Id=kwin_focus2 -File=kwinrc +Id=twin_focus2 +File=twinrc Group=Windows Options=overwrite -Script=kwin_focus2.sh,sh +Script=twin_focus2.sh,sh diff --git a/kwin/data/kwin_fsp_workarounds_1.upd b/kwin/data/kwin_fsp_workarounds_1.upd index 3a6182693..c451045c5 100644 --- a/kwin/data/kwin_fsp_workarounds_1.upd +++ b/kwin/data/kwin_fsp_workarounds_1.upd @@ -1,8 +1,8 @@ Id=trinity51 -# the file is intentionally a dummy, as the binary will update kwinrulesrc, -# file kwinrules_update will just remember it has been done -File=kwinrules_update +# the file is intentionally a dummy, as the binary will update twinrulesrc, +# file twinrules_update will just remember it has been done +File=twinrules_update Group=Dummy Options=overwrite -ScriptArguments=fsp_workarounds_1.kwinrules -Script=kwin_update_default_rules +ScriptArguments=fsp_workarounds_1.twinrules +Script=twin_update_default_rules diff --git a/kwin/data/kwiniconify.upd b/kwin/data/kwiniconify.upd index 1946a1a91..eae98094b 100644 --- a/kwin/data/kwiniconify.upd +++ b/kwin/data/kwiniconify.upd @@ -1,5 +1,5 @@ Id=iconifyupd3.1 -File=kwin.eventsrc +File=twin.eventsrc Group=iconify,minimize AllKeys Group=deiconify,unminimize diff --git a/kwin/data/kwinsticky.upd b/kwin/data/kwinsticky.upd index 3dc37ba47..84fd36788 100644 --- a/kwin/data/kwinsticky.upd +++ b/kwin/data/kwinsticky.upd @@ -1,5 +1,5 @@ Id=stickyupd3.1 -File=kwin.eventsrc +File=twin.eventsrc Group=sticky,on_all_desktops AllKeys Group=unsticky,not_on_all_desktops diff --git a/kwin/data/kwinupdatewindowsettings.upd b/kwin/data/kwinupdatewindowsettings.upd index dc205b464..74b252462 100644 --- a/kwin/data/kwinupdatewindowsettings.upd +++ b/kwin/data/kwinupdatewindowsettings.upd @@ -1,7 +1,7 @@ Id=trinity3b1 -# the file is intentionally a dummy, as the binary will update kwinrc and kwinrulesrc -# the kwin_update will just remember it has been done -File=kwin_update +# the file is intentionally a dummy, as the binary will update twinrc and twinrulesrc +# the twin_update will just remember it has been done +File=twin_update Group=Dummy Options=overwrite -Script=kwin_update_window_settings +Script=twin_update_window_settings diff --git a/kwin/data/pluginlibFix.pl b/kwin/data/pluginlibFix.pl index cb3859aeb..95357d1a2 100755 --- a/kwin/data/pluginlibFix.pl +++ b/kwin/data/pluginlibFix.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl foreach (<>) { - if(/^PluginLib=libkwin(.*)$/) { - print "PluginLib=kwin_$1\n"; + if(/^PluginLib=libtwin(.*)$/) { + print "PluginLib=twin_$1\n"; next; } print $_; diff --git a/kwin/data/update_default_rules.cpp b/kwin/data/update_default_rules.cpp index a949d6980..a5e018ba1 100644 --- a/kwin/data/update_default_rules.cpp +++ b/kwin/data/update_default_rules.cpp @@ -8,7 +8,7 @@ You can Freely distribute this program under the GNU General Public License. See the file "COPYING" for the exact licensing terms. ******************************************************************/ -// read addtional window rules and add them to kwinrulesrc +// read addtional window rules and add them to twinrulesrc #include <dcopclient.h> #include <kconfig.h> @@ -20,15 +20,15 @@ int main( int argc, char* argv[] ) { if( argc != 2 ) return 1; - KInstance inst( "kwin_update_default_rules" ); - TQString file = locate( "data", TQString( "kwin/default_rules/" ) + argv[ 1 ] ); + KInstance inst( "twin_update_default_rules" ); + TQString file = locate( "data", TQString( "twin/default_rules/" ) + argv[ 1 ] ); if( file.isEmpty()) { kdWarning() << "File " << argv[ 1 ] << " not found!" << endl; return 1; } KConfig src_cfg( file ); - KConfig dest_cfg( "kwinrulesrc" ); + KConfig dest_cfg( "twinrulesrc" ); src_cfg.setGroup( "General" ); dest_cfg.setGroup( "General" ); int count = src_cfg.readNumEntry( "count", 0 ); @@ -52,5 +52,5 @@ int main( int argc, char* argv[] ) dest_cfg.sync(); DCOPClient client; client.attach(); - client.send("kwin*", "", "reconfigure()", TQString("")); + client.send("twin*", "", "reconfigure()", TQString("")); } diff --git a/kwin/data/update_window_settings.cpp b/kwin/data/update_window_settings.cpp index 4c2414568..a82e26492 100644 --- a/kwin/data/update_window_settings.cpp +++ b/kwin/data/update_window_settings.cpp @@ -155,14 +155,14 @@ void writeRules( KConfig& cfg ) int main() { - KInstance inst( "kwin_update_window_settings" ); - KConfig src_cfg( "kwinrc" ); - KConfig dest_cfg( "kwinrulesrc" ); + KInstance inst( "twin_update_window_settings" ); + KConfig src_cfg( "twinrc" ); + KConfig dest_cfg( "twinrulesrc" ); loadFakeSessionInfo( &src_cfg ); writeRules( dest_cfg ); src_cfg.sync(); dest_cfg.sync(); DCOPClient client; client.attach(); - client.send("kwin*", "", "reconfigure()", TQString("")); + client.send("twin*", "", "reconfigure()", TQString("")); } |