KWin: rename client libraries twin3_* -> twin_*

Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>
pull/364/head
Mavridis Philippe 10 months ago
parent 84ab47055d
commit 88ea716029
No known key found for this signature in database
GPG Key ID: F8D2D7E2F989A494

@ -135,7 +135,7 @@
<inactiveHandle rgb="#1e1e1e" object="twin" />
</colors>
<cursors name="" />
<wm type="builtin" name="twin3_plastik" >
<wm type="builtin" name="twin_plastik" >
<border size="3" />
</wm>
<konqueror>

@ -135,7 +135,7 @@
<inactiveHandle rgb="#1e1e1e" object="twin" />
</colors>
<cursors name="" />
<wm type="builtin" name="twin3_plastik" >
<wm type="builtin" name="twin_plastik" >
<border size="3" />
</wm>
<konqueror>

@ -135,7 +135,7 @@
<inactiveHandle rgb="#e1e1e1" object="twin" />
</colors>
<cursors name="" />
<wm type="builtin" name="twin3_plastik" >
<wm type="builtin" name="twin_plastik" >
<border size="3" />
</wm>
<konqueror>

@ -135,7 +135,7 @@
<inactiveHandle rgb="#e1e1e1" object="twin" />
</colors>
<cursors name="" />
<wm type="builtin" name="twin3_plastik" >
<wm type="builtin" name="twin_plastik" >
<border size="1" />
</wm>
<konqueror>

@ -100,7 +100,7 @@
<inactiveTitleBtnBg rgb="#a7b5c7" object="twin" />
</colors>
<cursors name="" />
<wm type="builtin" name="twin3_default" >
<wm type="builtin" name="twin_default" >
<border size="1" />
</wm>
<konqueror>

@ -100,7 +100,7 @@
<inactiveTitleBtnBg rgb="#dcdcdc" object="twin" />
</colors>
<cursors name="" />
<wm type="builtin" name="twin3_keramik" >
<wm type="builtin" name="twin_keramik" >
<border size="1" />
</wm>
<konqueror>

@ -100,7 +100,7 @@
<inactiveTitleBtnBg rgb="#dcdcdc" object="twin" />
</colors>
<cursors name="" />
<wm type="builtin" name="twin3_plastik" >
<wm type="builtin" name="twin_plastik" >
<border size="1" />
</wm>
<konqueror>

@ -100,7 +100,7 @@
<inactiveTitleBtnBg rgb="#dcdcdc" object="twin" />
</colors>
<cursors name="" />
<wm type="builtin" name="twin3_system" >
<wm type="builtin" name="twin_system" >
<border size="1" />
</wm>
<konqueror>

@ -100,7 +100,7 @@
<inactiveTitleBtnBg rgb="#dcdcdc" object="twin" />
</colors>
<cursors name="" />
<wm type="builtin" name="twin3_redmond" >
<wm type="builtin" name="twin_redmond" >
<border size="1" />
</wm>
<konqueror>

@ -100,7 +100,7 @@
<inactiveTitleBtnBg rgb="#aeb2c3" object="twin" />
</colors>
<cursors name="" />
<wm type="builtin" name="twin3_cde" >
<wm type="builtin" name="twin_cde" >
<border size="1" />
</wm>
<konqueror>

@ -135,7 +135,7 @@
<inactiveHandle rgb="#1e1ee1" object="twin" />
</colors>
<cursors name="" />
<wm type="builtin" name="twin3_quartz" >
<wm type="builtin" name="twin_quartz" >
<border size="1" />
</wm>
<konqueror>

@ -135,7 +135,7 @@
<inactiveHandle rgb="#1e1ee1" object="twin" />
</colors>
<cursors name="" />
<wm type="builtin" name="twin3_quartz" >
<wm type="builtin" name="twin_quartz" >
<border size="1" />
</wm>
<konqueror>

@ -2,14 +2,10 @@ It's suggested you check sources of some KDE CVS decoration if in doubts or in n
Also, the API is documented in the .h header files.
Makefile.am:
- Change twin_ to twin3_ (in LDFLAGS, LIBADD, kde_module_LTLIBRARIES, SOURCES).
- Make sure LDFLAGS contains $(KDE_PLUGIN) and -module .
- Add -ltdecorations to LIBADD.
- Do NOT rename the directory where the .desktop file is installed ( $(kde_datadir)/twin/ ).
.desktop file:
- Change twin_ to twin3_ in X-TDE-Library.
Sources:
- There are no twin/something.h includes, and don't use the KWinInternal namespace.
- Use QToolTip instead of KWinToolTip.

@ -32,9 +32,9 @@ tde_create_translated_desktop(
)
##### twin3_b2 (module) #########################
##### twin_b2 (module) #########################
tde_add_kpart( twin3_b2 AUTOMOC
tde_add_kpart( twin_b2 AUTOMOC
SOURCES b2client.cpp
LINK tdecorations-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

@ -3,12 +3,12 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
SUBDIRS = . config
kde_module_LTLIBRARIES = twin3_b2.la
kde_module_LTLIBRARIES = twin_b2.la
twin3_b2_la_SOURCES = b2client.cpp
twin3_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin_b2_la_SOURCES = b2client.cpp
twin_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
# twin_b2_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
twin3_b2_la_LIBADD = ../../lib/libtdecorations.la
twin_b2_la_LIBADD = ../../lib/libtdecorations.la
METASOURCES = AUTO
noinst_HEADERS = b2client.h

@ -1,3 +1,3 @@
[Desktop Entry]
Name=B II
X-TDE-Library=twin3_b2
X-TDE-Library=twin_b2

@ -23,9 +23,9 @@ link_directories(
)
##### twin3_default (module) ####################
##### twin_default (module) ####################
tde_add_kpart( twin3_default AUTOMOC
tde_add_kpart( twin_default AUTOMOC
SOURCES kdedefault.cpp
LINK tdecorations-shared tdecore-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

@ -3,11 +3,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
SUBDIRS = . config
kde_module_LTLIBRARIES = twin3_default.la
kde_module_LTLIBRARIES = twin_default.la
twin3_default_la_SOURCES = kdedefault.cpp
twin3_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin3_default_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.la
twin_default_la_SOURCES = kdedefault.cpp
twin_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin_default_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.la
METASOURCES = AUTO
noinst_HEADERS = kdedefault.h

@ -32,12 +32,12 @@ tde_create_translated_desktop(
)
##### twin3_keramik (module) ####################
##### twin_keramik (module) ####################
set_source_files_properties( keramik.cpp
PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tiles.h )
tde_add_kpart( twin3_keramik AUTOMOC
tde_add_kpart( twin_keramik AUTOMOC
SOURCES keramik.cpp
LINK tdecorations-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

@ -10,13 +10,13 @@ embedtool_SOURCES = embedtool.cpp
embedtool_LDADD = $(LIB_TQT)
embedtool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
kde_module_LTLIBRARIES = twin3_keramik.la
kde_module_LTLIBRARIES = twin_keramik.la
twin3_keramik_la_SOURCES = keramik.cpp
twin3_keramik_la_COMPILE_FIRST = tiles.h
twin3_keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin3_keramik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
#twin3_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
twin_keramik_la_SOURCES = keramik.cpp
twin_keramik_la_COMPILE_FIRST = tiles.h
twin_keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin_keramik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
#twin_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
METASOURCES = AUTO
noinst_headers = keramik.h tiles.h

@ -1,3 +1,3 @@
[Desktop Entry]
Name=Keramik
X-TDE-Library=twin3_keramik
X-TDE-Library=twin_keramik

@ -1,11 +1,11 @@
SUBDIRS=cli_installer
INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = twin3_kwmtheme.la
kde_module_LTLIBRARIES = twin_kwmtheme.la
twin3_kwmtheme_la_SOURCES = kwmthemeclient.cpp
twin3_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin3_kwmtheme_la_LIBADD = -ltdecorations
twin_kwmtheme_la_SOURCES = kwmthemeclient.cpp
twin_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin_kwmtheme_la_LIBADD = -ltdecorations
METASOURCES = AUTO
noinst_HEADERS = kwmthemeclient.h

@ -1,3 +1,3 @@
[Desktop Entry]
Name=KWM Theme
X-TDE-Library=twin3_kwmtheme
X-TDE-Library=twin_kwmtheme

@ -30,9 +30,9 @@ tde_create_translated_desktop(
)
##### twin3_laptop (module) #####################
##### twin_laptop (module) #####################
tde_add_kpart( twin3_laptop AUTOMOC
tde_add_kpart( twin_laptop AUTOMOC
SOURCES laptopclient.cpp
LINK tdecorations-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

@ -1,11 +1,11 @@
INCLUDES = -I$(srcdir)/../../lib $(all_includes)
kde_module_LTLIBRARIES = twin3_laptop.la
kde_module_LTLIBRARIES = twin_laptop.la
twin3_laptop_la_SOURCES = laptopclient.cpp
twin3_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin3_laptop_la_LIBADD = ../../lib/libtdecorations.la
twin_laptop_la_SOURCES = laptopclient.cpp
twin_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin_laptop_la_LIBADD = ../../lib/libtdecorations.la
METASOURCES = AUTO
noinst_HEADERS = laptopclient.h

@ -1,3 +1,3 @@
[Desktop Entry]
Name=Laptop
X-TDE-Library=twin3_laptop
X-TDE-Library=twin_laptop

@ -31,9 +31,9 @@ tde_create_translated_desktop(
)
##### twin3_modernsys (module) ##################
##### twin_modernsys (module) ##################
tde_add_kpart( twin3_modernsys
tde_add_kpart( twin_modernsys
SOURCES modernsys.cpp
LINK tdecorations-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

@ -3,11 +3,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
SUBDIRS = config
kde_module_LTLIBRARIES = twin3_modernsys.la
kde_module_LTLIBRARIES = twin_modernsys.la
twin3_modernsys_la_SOURCES = modernsys.cpp
twin3_modernsys_la_LIBADD = ../../lib/libtdecorations.la
twin3_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin_modernsys_la_SOURCES = modernsys.cpp
twin_modernsys_la_LIBADD = ../../lib/libtdecorations.la
twin_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO
noinst_HEADERS = modernsys.h

@ -1,3 +1,3 @@
[Desktop Entry]
Name=Modern System
X-TDE-Library=twin3_modernsys
X-TDE-Library=twin_modernsys

@ -34,9 +34,9 @@ tde_create_translated_desktop(
)
##### twin3_plastik (module) ####################
##### twin_plastik (module) ####################
tde_add_kpart( twin3_plastik AUTOMOC
tde_add_kpart( twin_plastik AUTOMOC
SOURCES plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp
LINK tdecorations-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

@ -9,11 +9,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
twindir = $(kde_datadir)/twin/
twin_DATA = plastik.desktop
kde_module_LTLIBRARIES = twin3_plastik.la
twin3_plastik_la_SOURCES = plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp
twin3_plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin3_plastik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
twin3_plastik_la_METASOURCES = AUTO
kde_module_LTLIBRARIES = twin_plastik.la
twin_plastik_la_SOURCES = plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp
twin_plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin_plastik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
twin_plastik_la_METASOURCES = AUTO
DISTCLEANFILES = $(twin3_plastik_la_METASOURCES)
DISTCLEANFILES = $(twin_plastik_la_METASOURCES)

@ -1,3 +1,3 @@
[Desktop Entry]
Name=Plastik
X-TDE-Library=twin3_plastik
X-TDE-Library=twin_plastik

@ -32,9 +32,9 @@ tde_create_translated_desktop(
)
##### twin3_quartz (module) #####################
##### twin_quartz (module) #####################
tde_add_kpart( twin3_quartz AUTOMOC
tde_add_kpart( twin_quartz AUTOMOC
SOURCES quartz.cpp
LINK tdecorations-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

@ -3,11 +3,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
SUBDIRS = . config
kde_module_LTLIBRARIES = twin3_quartz.la
kde_module_LTLIBRARIES = twin_quartz.la
twin3_quartz_la_SOURCES = quartz.cpp
twin3_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin3_quartz_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
twin_quartz_la_SOURCES = quartz.cpp
twin_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin_quartz_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
METASOURCES = AUTO
noinst_HEADERS = quartz.h

@ -1,3 +1,3 @@
[Desktop Entry]
Name=Quartz
X-TDE-Library=twin3_quartz
X-TDE-Library=twin_quartz

@ -30,9 +30,9 @@ tde_create_translated_desktop(
)
##### twin3_redmond (module) ####################
##### twin_redmond (module) ####################
tde_add_kpart( twin3_redmond AUTOMOC
tde_add_kpart( twin_redmond AUTOMOC
SOURCES redmond.cpp
LINK tdecorations-shared tdecore-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

@ -1,11 +1,11 @@
INCLUDES = -I$(srcdir)/../../lib $(all_includes)
kde_module_LTLIBRARIES = twin3_redmond.la
kde_module_LTLIBRARIES = twin_redmond.la
twin3_redmond_la_SOURCES = redmond.cpp
twin3_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin3_redmond_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.la
twin_redmond_la_SOURCES = redmond.cpp
twin_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin_redmond_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.la
METASOURCES = AUTO
noinst_HEADERS = redmond.h

@ -1,3 +1,3 @@
[Desktop Entry]
Name=Redmond
X-TDE-Library=twin3_redmond
X-TDE-Library=twin_redmond

@ -1,10 +1,10 @@
INCLUDES = -I$(srcdir)/../../lib $(all_includes)
kde_module_LTLIBRARIES = twin3_test.la
kde_module_LTLIBRARIES = twin_test.la
twin3_test_la_SOURCES = test.cpp
twin3_test_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin3_test_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
twin_test_la_SOURCES = test.cpp
twin_test_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin_test_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
#twin_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
METASOURCES = AUTO

@ -1,3 +1,3 @@
[Desktop Entry]
Name=KWin test
X-TDE-Library=twin3_test
X-TDE-Library=twin_test

@ -29,9 +29,9 @@ tde_create_translated_desktop(
)
##### twin3_web (module) ########################
##### twin_web (module) ########################
tde_add_kpart( twin3_web AUTOMOC
tde_add_kpart( twin_web AUTOMOC
SOURCES Web.cpp WebButton.cpp
LINK tdecorations-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

@ -1,12 +1,12 @@
INCLUDES = -I$(top_srcdir) $(all_includes)
kde_module_LTLIBRARIES = twin3_web.la
kde_module_LTLIBRARIES = twin_web.la
twin3_web_la_SOURCES = Web.cpp WebButton.cpp
twin_web_la_SOURCES = Web.cpp WebButton.cpp
noinst_HEADERS = Web.h WebButton.h
twin3_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin3_web_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
twin_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin_web_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
METASOURCES = AUTO
linkdir = $(kde_datadir)/twin/

@ -1,3 +1,3 @@
[Desktop Entry]
Name=Web
X-TDE-Library=twin3_web
X-TDE-Library=twin_web

@ -22,13 +22,13 @@ link_directories(
##### other data ################################
install( FILES
twin.upd twinsticky.upd twiniconify.upd twin3_plugin.upd
twin.upd twinsticky.upd twiniconify.upd
twin_focus1.upd twinupdatewindowsettings.upd
twin_focus2.upd twin_fsp_workarounds_1.upd
DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
install( PROGRAMS
pluginlibFix.pl twin3_plugin.pl twin_focus1.sh twin_focus2.sh
pluginlibFix.pl twin_focus1.sh twin_focus2.sh
DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
install( FILES

@ -16,9 +16,9 @@ METASOURCES = AUTO
sounddir= $(kde_sounddir)
sound_DATA = pop.wav
update_DATA = twin.upd twinsticky.upd twiniconify.upd twin3_plugin.upd twin_focus1.upd \
update_DATA = twin.upd twinsticky.upd twiniconify.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
update_SCRIPTS = pluginlibFix.pl twin_focus1.sh twin_focus2.sh
updatedir = $(kde_datadir)/tdeconf_update
twin_default_rules_DATA = fsp_workarounds_1.twinrules

@ -1,8 +0,0 @@
#!/usr/bin/perl
foreach (<>) {
if(/^PluginLib=twin_(.*)$/) {
print "PluginLib=twin3_$1\n";
next;
}
print $_;
}

@ -1,4 +0,0 @@
Id=trinity.2
File=twinrc
Options=overwrite
Script=twin3_plugin.pl,perl

@ -42,7 +42,7 @@ KDecorationPlugins::KDecorationPlugins( TDEConfig* cfg )
fact( NULL ),
old_library( NULL ),
old_fact( NULL ),
pluginStr( "twin3_undefined " ),
pluginStr( "twin_undefined " ),
config( cfg )
{
}

@ -23,7 +23,7 @@ PluginMgr::PluginMgr()
: KDecorationPlugins( TDEGlobal::config())
{
defaultPlugin = (TQPixmap::defaultDepth() > 8) ?
"twin3_plastik" : "twin3_quartz";
"twin_plastik" : "twin_quartz";
loadPlugin( "" ); // load the plugin specified in cfg file
}

@ -39,7 +39,7 @@
static TDECmdLineOptions options[] =
{
{ "+decoration", "Decoration library to use, such as twin3_plastik.", 0 },
{ "+decoration", "Decoration library to use, such as twin_plastik.", 0 },
{ "+tests", "Which test should be executed ('all', 'repaint', 'caption', 'resize', 'recreation')", 0 },
{ "+repetitions", "Number of test repetitions.", 0 },
{ 0, 0, 0 }

Loading…
Cancel
Save