diff options
Diffstat (limited to 'kwin/clients/quartz')
| -rw-r--r-- | kwin/clients/quartz/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | kwin/clients/quartz/Makefile.am | 10 | ||||
| -rw-r--r-- | kwin/clients/quartz/config/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | kwin/clients/quartz/config/Makefile.am | 10 | ||||
| -rw-r--r-- | kwin/clients/quartz/config/config.cpp | 16 | ||||
| -rw-r--r-- | kwin/clients/quartz/quartz.cpp | 2 | ||||
| -rw-r--r-- | kwin/clients/quartz/quartz.desktop | 2 |
7 files changed, 26 insertions, 26 deletions
diff --git a/kwin/clients/quartz/CMakeLists.txt b/kwin/clients/quartz/CMakeLists.txt index 160a3cd52..c521bc19c 100644 --- a/kwin/clients/quartz/CMakeLists.txt +++ b/kwin/clients/quartz/CMakeLists.txt @@ -13,7 +13,7 @@ add_subdirectory( config ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kwin/lib + ${CMAKE_SOURCE_DIR}/twin/lib ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -25,12 +25,12 @@ link_directories( ##### other data ################################ -install( FILES quartz.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) +install( FILES quartz.desktop DESTINATION ${DATA_INSTALL_DIR}/twin ) -##### kwin3_quartz (module) ##################### +##### twin3_quartz (module) ##################### -tde_add_kpart( kwin3_quartz AUTOMOC +tde_add_kpart( twin3_quartz AUTOMOC SOURCES quartz.cpp LINK tdecorations-shared tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/kwin/clients/quartz/Makefile.am b/kwin/clients/quartz/Makefile.am index adfc59968..3a5709773 100644 --- a/kwin/clients/quartz/Makefile.am +++ b/kwin/clients/quartz/Makefile.am @@ -3,16 +3,16 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes) SUBDIRS = . config -kde_module_LTLIBRARIES = kwin3_quartz.la +kde_module_LTLIBRARIES = twin3_quartz.la -kwin3_quartz_la_SOURCES = quartz.cpp -kwin3_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin3_quartz_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.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 METASOURCES = AUTO noinst_HEADERS = quartz.h -lnkdir = $(kde_datadir)/kwin/ +lnkdir = $(kde_datadir)/twin/ lnk_DATA = quartz.desktop EXTRA_DIST = $(lnk_DATA) diff --git a/kwin/clients/quartz/config/CMakeLists.txt b/kwin/clients/quartz/config/CMakeLists.txt index 3142505c7..e5554bb40 100644 --- a/kwin/clients/quartz/config/CMakeLists.txt +++ b/kwin/clients/quartz/config/CMakeLists.txt @@ -20,9 +20,9 @@ link_directories( ) -##### kwin_quartz_config (module) ############### +##### twin_quartz_config (module) ############### -tde_add_kpart( kwin_quartz_config AUTOMOC +tde_add_kpart( twin_quartz_config AUTOMOC SOURCES config.cpp LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/kwin/clients/quartz/config/Makefile.am b/kwin/clients/quartz/config/Makefile.am index 525db9fe1..8a96e85a3 100644 --- a/kwin/clients/quartz/config/Makefile.am +++ b/kwin/clients/quartz/config/Makefile.am @@ -1,15 +1,15 @@ INCLUDES = $(all_includes) -kde_module_LTLIBRARIES = kwin_quartz_config.la +kde_module_LTLIBRARIES = twin_quartz_config.la -kwin_quartz_config_la_SOURCES = config.cpp -kwin_quartz_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin_quartz_config_la_LIBADD = $(LIB_TDEUI) +twin_quartz_config_la_SOURCES = config.cpp +twin_quartz_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_quartz_config_la_LIBADD = $(LIB_TDEUI) METASOURCES = AUTO noinst_HEADERS = config.h -lnkdir = $(kde_datadir)/kwin/ +lnkdir = $(kde_datadir)/twin/ ###KMAKE-start (don't edit or delete this block) diff --git a/kwin/clients/quartz/config/config.cpp b/kwin/clients/quartz/config/config.cpp index d15eb4da1..c4c8e5cba 100644 --- a/kwin/clients/quartz/config/config.cpp +++ b/kwin/clients/quartz/config/config.cpp @@ -23,18 +23,18 @@ extern "C" /* NOTE: - * 'conf' is a pointer to the kwindecoration modules open kwin config, + * 'conf' is a pointer to the twindecoration modules open twin config, * and is by default set to the "Style" group. * * 'parent' is the parent of the TQObject, which is a VBox inside the - * Configure tab in kwindecoration + * Configure tab in twindecoration */ QuartzConfig::QuartzConfig( KConfig* conf, TQWidget* parent ) : TQObject( parent ) { - quartzConfig = new KConfig("kwinquartzrc"); - KGlobal::locale()->insertCatalogue("kwin_clients"); + quartzConfig = new KConfig("twinquartzrc"); + KGlobal::locale()->insertCatalogue("twin_clients"); gb = new TQVBox( parent ); cbColorBorder = new TQCheckBox( i18n("Draw window frames using &titlebar colors"), gb ); @@ -52,7 +52,7 @@ QuartzConfig::QuartzConfig( KConfig* conf, TQWidget* parent ) connect( cbColorBorder, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()) ); connect( cbExtraSmall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()) ); - // Make the widgets visible in kwindecoration + // Make the widgets visible in twindecoration gb->show(); } @@ -70,8 +70,8 @@ void QuartzConfig::slotSelectionChanged() } -// Loads the configurable options from the kwinrc config file -// It is passed the open config from kwindecoration to improve efficiency +// Loads the configurable options from the twinrc config file +// It is passed the open config from twindecoration to improve efficiency void QuartzConfig::load( KConfig* /*conf*/ ) { quartzConfig->setGroup("General"); @@ -82,7 +82,7 @@ void QuartzConfig::load( KConfig* /*conf*/ ) } -// Saves the configurable options to the kwinrc config file +// Saves the configurable options to the twinrc config file void QuartzConfig::save( KConfig* /*conf*/ ) { quartzConfig->setGroup("General"); diff --git a/kwin/clients/quartz/quartz.cpp b/kwin/clients/quartz/quartz.cpp index 2bb0205ae..d0b8974cf 100644 --- a/kwin/clients/quartz/quartz.cpp +++ b/kwin/clients/quartz/quartz.cpp @@ -201,7 +201,7 @@ bool QuartzHandler::supports( Ability ability ) void QuartzHandler::readConfig() { - KConfig conf("kwinquartzrc"); + KConfig conf("twinquartzrc"); conf.setGroup("General"); coloredFrame = conf.readBoolEntry( "UseTitleBarBorderColors", true ); extraSlim = conf.readBoolEntry( "UseQuartzExtraSlim", false ); diff --git a/kwin/clients/quartz/quartz.desktop b/kwin/clients/quartz/quartz.desktop index 30a177973..d84c1d4dd 100644 --- a/kwin/clients/quartz/quartz.desktop +++ b/kwin/clients/quartz/quartz.desktop @@ -36,4 +36,4 @@ Name[uz@cyrillic]=Чақмоқтош Name[ven]=Musuku Name[vi]=Thạch anh Name[zh_TW]=石英 -X-KDE-Library=kwin3_quartz +X-KDE-Library=twin3_quartz |