diff options
310 files changed, 1407 insertions, 1407 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d4ca7c799..a356bb704 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,7 +87,7 @@ option( BUILD_DOC "Build doc" ${BUILD_ALL} ) option( BUILD_LIBKONQ "Build libkonq" ${BUILD_ALL} ) option( BUILD_KCMINIT "Build kcminit" ${BUILD_ALL} ) option( BUILD_KCONTROL "Build kcontrol" ${BUILD_ALL} ) -option( BUILD_KWIN "Build kwin" ${BUILD_ALL} ) +option( BUILD_KWIN "Build twin" ${BUILD_ALL} ) option( BUILD_KATE "Build kate" ${BUILD_ALL} ) option( BUILD_KONQUEROR "Build konqueror" ${BUILD_ALL} ) option( BUILD_KIOSLAVES "Build kioslaves" ${BUILD_ALL} ) @@ -161,7 +161,7 @@ tde_conditional_add_subdirectory( BUILD_DOC doc ) tde_conditional_add_subdirectory( BUILD_LIBKONQ libkonq ) tde_conditional_add_subdirectory( BUILD_KCMINIT kcminit ) add_subdirectory( kcontrol ) -tde_conditional_add_subdirectory( BUILD_KWIN kwin ) +tde_conditional_add_subdirectory( BUILD_KWIN twin ) tde_conditional_add_subdirectory( BUILD_KATE kate ) tde_conditional_add_subdirectory( BUILD_KONQUEROR konqueror ) tde_conditional_add_subdirectory( BUILD_KIOSLAVES kioslave ) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index cf43d6ea0..259da26e1 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -44,7 +44,7 @@ if( WITH_HAL ) endif( ) -# xrender (kdesktop, konsole, kcontrol, kicker, kwin) +# xrender (kdesktop, konsole, kcontrol, kicker, twin) if( WITH_XRENDER OR BUILD_KDESKTOP OR BUILD_KONSOLE OR BUILD_KCONTROL OR BUILD_KICKER ) pkg_search_module( XRENDER xrender ) if( XRENDER_FOUND ) @@ -66,7 +66,7 @@ if( WITH_XCURSOR ) endif( ) -# xcomposite (kicker, kwin) +# xcomposite (kicker, twin) if( WITH_XCOMPOSITE ) pkg_search_module( XCOMPOSITE xcomposite ) if( XCOMPOSITE_FOUND ) @@ -88,7 +88,7 @@ if( WITH_XFIXES ) endif( ) -# xdamage (kwin/kompmgr) +# xdamage (twin/kompmgr) if( WITH_XDAMAGE ) pkg_search_module( XDAMAGE xdamage ) if( NOT XDAMAGE_FOUND ) @@ -97,7 +97,7 @@ if( WITH_XDAMAGE ) endif( ) -# xext (kwin/kompmgr) +# xext (twin/kompmgr) if( WITH_XEXT ) pkg_search_module( XEXT xext ) if( NOT XEXT_FOUND ) @@ -133,7 +133,7 @@ libraries. Here is an overview of the directories: * ktip Gives you tips how to use KDE. -* kwin +* twin The KDE window manager (moves, resizes and decorates windows). * kxkb diff --git a/doc/faq/intro.docbook b/doc/faq/intro.docbook index 6f9546791..fab2a3064 100644 --- a/doc/faq/intro.docbook +++ b/doc/faq/intro.docbook @@ -45,7 +45,7 @@ particular the &gcc; compiler.</para> </question> <answer> <para>No, &kde; is not a window manager. While &kde; includes a very -sophisticated window manager (&kwin;), &kde; is much more than that. +sophisticated window manager (&twin;), &kde; is much more than that. It is a full-blown Integrated Desktop Environment.</para> <para>&kde; provides a complete desktop environment, including a web browser, a file manager, a window manager, a help system, a diff --git a/doc/faq/misc.docbook b/doc/faq/misc.docbook index 61d2950f3..ec5ce3209 100644 --- a/doc/faq/misc.docbook +++ b/doc/faq/misc.docbook @@ -15,7 +15,7 @@ <para>Does &kde; support transparency and other visual effects provided by the new composite extension to X.org?</para> </question> <answer> -<para> Yes! An exciting new feature for &kde; 3.4 is support for the new X composite extension. This allows for effects such as translucency and drop shadows for all windows, easily configurable through &kwin;'s configuration dialog. This requires you to be using X.org version 6.8.0 or newer and have: +<para> Yes! An exciting new feature for &kde; 3.4 is support for the new X composite extension. This allows for effects such as translucency and drop shadows for all windows, easily configurable through &twin;'s configuration dialog. This requires you to be using X.org version 6.8.0 or newer and have: <screen> Section "Extensions" diff --git a/doc/faq/winmng.docbook b/doc/faq/winmng.docbook index f32384754..d001b8425 100644 --- a/doc/faq/winmng.docbook +++ b/doc/faq/winmng.docbook @@ -10,14 +10,14 @@ <title>The window manager</title> <para>The default window manager provided by &kde; is the K Window -Manager (&kwin;). Please read <quote>The +Manager (&twin;). Please read <quote>The K Window Manager Handbook</quote> (which should be accessible from the <application>&kde; Help Center</application>) for usage information.</para> <qandaset> <qandaentry> <question> -<para>Are there keyboard shortcuts for &kwin; operations?</para> +<para>Are there keyboard shortcuts for &twin; operations?</para> </question> <answer> <para>Yes. Please refer to "The K Window Manager Handbook" for the @@ -58,7 +58,7 @@ Iconified tasks will have their names displayed in gray.</para> </listitem> <listitem> <para>If you click the &MMB; on the root window (&ie;, -the background of the desktop), &kwin; will give you a list +the background of the desktop), &twin; will give you a list of all available tasks.</para> </listitem> </itemizedlist> diff --git a/doc/kcontrol/kwindecoration/CMakeLists.txt b/doc/kcontrol/kwindecoration/CMakeLists.txt index 55ac98586..a4fb05f50 100644 --- a/doc/kcontrol/kwindecoration/CMakeLists.txt +++ b/doc/kcontrol/kwindecoration/CMakeLists.txt @@ -9,4 +9,4 @@ # ################################################# -tde_create_handbook( DESTINATION kcontrol/kwindecoration ) +tde_create_handbook( DESTINATION kcontrol/twindecoration ) diff --git a/doc/kcontrol/kwindecoration/Makefile.am b/doc/kcontrol/kwindecoration/Makefile.am index ad89ecd92..6ee826f55 100644 --- a/doc/kcontrol/kwindecoration/Makefile.am +++ b/doc/kcontrol/kwindecoration/Makefile.am @@ -1,2 +1,2 @@ KDE_LANG = en -KDE_DOCS = kcontrol/kwindecoration +KDE_DOCS = kcontrol/twindecoration diff --git a/doc/kcontrol/kwindecoration/index.docbook b/doc/kcontrol/kwindecoration/index.docbook index c6bfd5276..c94c12d30 100644 --- a/doc/kcontrol/kwindecoration/index.docbook +++ b/doc/kcontrol/kwindecoration/index.docbook @@ -19,7 +19,7 @@ <keywordset> <keyword>KDE</keyword> <keyword>KControl</keyword> -<keyword>kwin</keyword> +<keyword>twin</keyword> <keyword>window</keyword> <keyword>border</keyword> <keyword>theme</keyword> diff --git a/doc/kcontrol/windowmanagement/index.docbook b/doc/kcontrol/windowmanagement/index.docbook index 650b8d2aa..77b21ca45 100644 --- a/doc/kcontrol/windowmanagement/index.docbook +++ b/doc/kcontrol/windowmanagement/index.docbook @@ -32,7 +32,7 @@ some windows.</para> <note> <para>Please note that this configuration will not take effect if you -do not use &kwin; as your window manager. If you do use a different +do not use &twin; as your window manager. If you do use a different window manager, please refer to its documentation for how to customize window behavior.</para> </note> diff --git a/doc/kompmgr/index.docbook b/doc/kompmgr/index.docbook index 2d70bc9d6..192c7dd8e 100644 --- a/doc/kompmgr/index.docbook +++ b/doc/kompmgr/index.docbook @@ -1,7 +1,7 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ <!ENTITY kappname "kompmgr"> - <!ENTITY package "kwin"> + <!ENTITY package "twin"> <!ENTITY % English "INCLUDE"> <!ENTITY % addindex "IGNORE"> ]> @@ -30,7 +30,7 @@ <releaseinfo>2.0.1</releaseinfo> <abstract> -<para>&kappname; is a composite rendering engine to be used by &kwin;.</para> +<para>&kappname; is a composite rendering engine to be used by &twin;.</para> <para>This document is rather a general explanation of what it does, how it works and what the restrictions are than a documentation how to use it (as it works in the background automatically).</para> @@ -38,7 +38,7 @@ it (as it works in the background automatically).</para> <keywordset> <keyword>KDE</keyword> -<keyword>kwin</keyword> +<keyword>twin</keyword> <keyword>render engine</keyword> </keywordset> </bookinfo> diff --git a/doc/userguide/control-center.docbook b/doc/userguide/control-center.docbook index 240046c73..774be64ac 100644 --- a/doc/userguide/control-center.docbook +++ b/doc/userguide/control-center.docbook @@ -252,7 +252,7 @@ mouse buttons.</para> <term><guilabel>Window Behavior</guilabel></term> <listitem> <para>This is where you would configure options related to the behavior of -&kde;'s window manager, &kwin;. &kwin; is extremely configurable and has +&kde;'s window manager, &twin;. &twin; is extremely configurable and has advanced features such as focus stealing prevention and different focus policies such as focus follows mouse. You can also configure what actions you would like to bind to certain keys and mouse events.</para> diff --git a/doc/userguide/customizing-desktop.docbook b/doc/userguide/customizing-desktop.docbook index eb427d599..4d095cbdc 100644 --- a/doc/userguide/customizing-desktop.docbook +++ b/doc/userguide/customizing-desktop.docbook @@ -118,7 +118,7 @@ to apply effects such as translucency. Window decorations must be able to do all these without sacrificing speed and performance. This is the reason why window decorations come in source code that must be compiled, or as binary packages that must be installed. Basically, Window decorations are plugins or small -programs that instruct &kwin;, &kde;'s Window Manager, +programs that instruct &twin;, &kde;'s Window Manager, how to display window frames.</para> <para>In order to add a new window decoration, you need to compile it from @@ -153,7 +153,7 @@ while this may be unnoticeable on very fast systems.</para> <para>To add an IceWM theme, select IceWM as the window decoration and click on the <guilabel>Open &kde;'s IceWM theme folder</guilabel> link in the window decoration description area. This will open a &konqueror; window -to <filename>$<envar>KDEHOME</envar>/share/apps/kwin/icewm-themes</filename>. +to <filename>$<envar>KDEHOME</envar>/share/apps/twin/icewm-themes</filename>. Extract your IceWM theme to this folder. The theme will then be added to the list of IceWM themes. Select the theme you want to use and click on <guibutton>Apply</guibutton>.</para> diff --git a/doc/userguide/kde-for-admins.docbook b/doc/userguide/kde-for-admins.docbook index 6424ea965..da0d91496 100644 --- a/doc/userguide/kde-for-admins.docbook +++ b/doc/userguide/kde-for-admins.docbook @@ -1135,7 +1135,7 @@ at the time the session was saved. Sessions are stored in the references to application-specific state information. The application-specific state information is saved in <filename class="directory">$<envar>KDEHOME</envar>/share/config/session</filename>. -The state information of &kwin; contains the location of the application +The state information of &twin; contains the location of the application windows of all the other applications in the session. </para> @@ -1184,7 +1184,7 @@ class="username">root</systemitem>.</para> <varlistentry><term>$<envar>KDEWM</envar></term><listitem><para>If the <envar>KDEWM</envar> environment variable has been set, then it will be used as &kde;'s window manager within the -<command>startkde</command> script instead of &kwin;.</para> +<command>startkde</command> script instead of &twin;.</para> </listitem> </varlistentry> diff --git a/doc/userguide/under-the-hood.docbook b/doc/userguide/under-the-hood.docbook index 094a01d63..be6cacdfc 100644 --- a/doc/userguide/under-the-hood.docbook +++ b/doc/userguide/under-the-hood.docbook @@ -381,13 +381,13 @@ the one with the <guiicon>Next Page</guiicon> picture on it. </step> <step> <para>In the <guilabel>Command/URL Settings</guilabel> tab, enter the -command to run in the field: <userinput><command>dcop kwin default +command to run in the field: <userinput><command>dcop twin default nextDesktop</command></userinput></para> </step> </procedure> <para>Repeat the above with the <keysym>Prev_Virtual_Screen</keysym> key and -<userinput><command>dcop kwin default +<userinput><command>dcop twin default previousDesktop</command></userinput>.</para> <para>Now pressing the <keysym>Prev_Virtual_Screen</keysym> or diff --git a/drkonqi/presets/enduserrc b/drkonqi/presets/enduserrc index 323eb93c3..816795892 100644 --- a/drkonqi/presets/enduserrc +++ b/drkonqi/presets/enduserrc @@ -492,7 +492,7 @@ Comment[uz@cyrillic]=Дастурнинг иши SIGABRT сигнали била Comment[ven]==Apulikhesheni i fhela nga luswayo lwa SIGABRT musi i tshi sedzulusa mifhirifhiri ya nga mgomu yo vhangwaho nga baga kha mbekanyamushumo. Comment[vi]=Một chương trình bị dừng bởi một tín hiệu SIGABRT khi nó tìm ra một mâu thuẫn nội bộ gây ra bởi lỗi nào đó. Comment[wa]=On programe a fini avou on signå SIGABRT cwand il a trové ene divintrinne inconsistance a cåze d' on bug dins l' programe. -Comment[xh]=Isicelo sicinywa ngophawu lwe SIGABRT xa sibona ukungahambisalani kwangaphakathi okwenziwa ligciwane kwinkqubo. +Comment[xh]=Isicelo sicinywa ngophawu lwe SIGABRT xa sibona ukungahambisalani kwangaphakathi okwenziwa ligciwane twinkqubo. Comment[zh_CN]=程序在检测到缺陷引起的内部不一致时，以 SIGABRT 信号中止。 Comment[zh_TW]=程式偵測發生到內部錯誤時，以 SIGABRT 信號中止。 Comment[zu]=Umyaleli wekhompyutha unqamuka ngophawu lwe-SIGABRT uma ecosha ukungahambisani kwangaphakathi okubangwe igciwane elisohlelweni lwemisebenzi. diff --git a/kate/ChangeLog b/kate/ChangeLog index 68dc0da01..409ba649c 100644 --- a/kate/ChangeLog +++ b/kate/ChangeLog @@ -279,7 +279,7 @@ * kateconsole.* konsole/* : add kateconsole widget 2001-02-16 Anders Lund <anders@alweb.dk> - * katemainwindow.cpp :fixing read/write options to use maindockwindow functions. + * katemainwindow.cpp :fixing read/write options to use maindoctwindow functions. 2001-02-15 Joseph Wenninger <jowenn@kde.org> * kateview.cpp : Tab doesn't jump to next widget anymore, but inserts a tab into the text diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp index 9d9c7ba15..ac9f9a537 100644 --- a/kate/app/kateapp.cpp +++ b/kate/app/kateapp.cpp @@ -33,7 +33,7 @@ #include <kcmdlineargs.h> #include <dcopclient.h> #include <kconfig.h> -#include <kwin.h> +#include <twin.h> #include <ktip.h> #include <kdebug.h> #include <klibloader.h> diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp index 3574756e4..d78b89dd8 100644 --- a/kate/app/kateconfigdialog.cpp +++ b/kate/app/kateconfigdialog.cpp @@ -57,7 +57,7 @@ #include <ksimpleconfig.h> #include <kstdaction.h> #include <kstandarddirs.h> -#include <kwin.h> +#include <twin.h> #include <kseparator.h> KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp index 5ef081de7..abcf05d15 100644 --- a/kate/app/katedocmanager.cpp +++ b/kate/app/katedocmanager.cpp @@ -40,7 +40,7 @@ #include <kmessagebox.h> #include <kencodingfiledialog.h> #include <kio/job.h> -#include <kwin.h> +#include <twin.h> #include <tqdatetime.h> #include <tqtextcodec.h> diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp index 0d69b83fc..206389b20 100644 --- a/kcontrol/access/kaccess.cpp +++ b/kcontrol/access/kaccess.cpp @@ -20,7 +20,7 @@ #include <netwm.h> #include <kshortcut.h> #include <kkeynative.h> -#include <kwin.h> +#include <twin.h> #include <X11/XKBlib.h> #define XK_MISCELLANY diff --git a/kcontrol/access/kaccess.h b/kcontrol/access/kaccess.h index 98ed91d5b..95d8b2559 100644 --- a/kcontrol/access/kaccess.h +++ b/kcontrol/access/kaccess.h @@ -7,7 +7,7 @@ #include <kuniqueapplication.h> -#include <kwinmodule.h> +#include <twinmodule.h> #include <X11/Xlib.h> diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp index 0f97753e4..e14be2af0 100644 --- a/kcontrol/background/bgadvanced.cpp +++ b/kcontrol/background/bgadvanced.cpp @@ -38,7 +38,7 @@ #include <kmessagebox.h> #include <kpixmap.h> #include <kstandarddirs.h> -#include <kwin.h> +#include <twin.h> #include "bgrender.h" #include "bgadvanced.h" diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp index 1e681c3d6..64a14ca63 100644 --- a/kcontrol/background/bgdialog.cpp +++ b/kcontrol/background/bgdialog.cpp @@ -52,8 +52,8 @@ #include <kstandarddirs.h> #include <kstringhandler.h> #include <kurlrequester.h> -#include <kwin.h> -#include <kwinmodule.h> +#include <twin.h> +#include <twinmodule.h> #include <kimagefilepreview.h> #include <knewstuff/downloaddialog.h> @@ -74,10 +74,10 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop) m_multidesktop = _multidesktop; m_previewUpdates = true; - KWinModule *m_kwin; - m_kwin = new KWinModule(TQT_TQOBJECT(this)); - m_curDesk = m_kwin->currentDesktop(); - TQSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop())); + KWinModule *m_twin; + m_twin = new KWinModule(TQT_TQOBJECT(this)); + m_curDesk = m_twin->currentDesktop(); + TQSize s(m_twin->numberOfViewports(m_twin->currentDesktop())); m_useViewports = s.width() * s.height() > 1; m_numDesks = m_multidesktop ? KWin::numberOfDesktops() : 1; @@ -90,12 +90,12 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop) m_numScreens = 1; } - TQPoint vx(m_kwin->currentViewport(m_kwin->currentDesktop())); + TQPoint vx(m_twin->currentViewport(m_twin->currentDesktop())); int t_eViewport = (vx.x() * vx.y()); if (t_eViewport < 1) { t_eViewport = 1; } - delete m_kwin; + delete m_twin; m_desk = m_multidesktop ? KWin::currentDesktop() : 1; m_desk = m_multidesktop ? (m_useViewports ? (((m_desk - 1) * m_numViewports) + t_eViewport) : m_desk) : m_desk; diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp index 0f5d035b6..450b140a5 100644 --- a/kcontrol/colors/widgetcanvas.cpp +++ b/kcontrol/colors/widgetcanvas.cpp @@ -356,7 +356,7 @@ void WidgetCanvas::drawSampleWidgets() KPixmap pmTitle; pmTitle.resize( width()-160, 20 ); - // Switched to vertical gradient because those kwin styles that + // Switched to vertical gradient because those twin styles that // use the gradient have it vertical. KPixmapEffect::gradient(pmTitle, iaTitle, iaBlend, KPixmapEffect::HorizontalGradient); @@ -400,7 +400,7 @@ void WidgetCanvas::drawSampleWidgets() paint.setBrush( aTitle );paint.setPen( aTitle ); paint.drawRect( 65, 30+5, width()-152, 20 ); - // Switched to vertical gradient because those kwin styles that + // Switched to vertical gradient because those twin styles that // use the gradient have it vertical. pmTitle.resize( width()-152, 20 ); KPixmapEffect::gradient(pmTitle, aTitle, aBlend, diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index 4389a10fe..f2c00d230 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/kcontrol/kcontrol/toplevel.cpp @@ -26,7 +26,7 @@ #include <kmessagebox.h> #include <kinstance.h> #include <kaction.h> -#include <kwin.h> +#include <twin.h> #include <kiconloader.h> #include <klineedit.h> diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp index 5845cff8f..75ec4edcb 100644 --- a/kcontrol/keys/keyconfig.cpp +++ b/kcontrol/keys/keyconfig.cpp @@ -61,7 +61,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) // see also KKeyModule::init() below !!! #define NOSLOTS #define KShortcuts KAccelShortcuts -#include "../../kwin/kwinbindings.cpp" +#include "../../twin/twinbindings.cpp" #include "../../kicker/kicker/core/kickerbindings.cpp" #include "../../kicker/taskbar/taskbarbindings.cpp" #include "../../kdesktop/kdesktopbindings.cpp" @@ -209,7 +209,7 @@ void KKeyModule::load() if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); // TODO: create a reconfigureKeys() method. - kapp->dcopClient()->send("kwin", "", "reconfigure()", ""); + kapp->dcopClient()->send("twin", "", "reconfigure()", ""); kapp->dcopClient()->send("kdesktop", "", "configure()", ""); kapp->dcopClient()->send("kicker", "Panel", "configure()", ""); } @@ -485,7 +485,7 @@ void KKeyModule::init() #define NOSLOTS #define KShortcuts KAccelShortcuts #include "../../klipper/klipperbindings.cpp" -#include "../../kwin/kwinbindings.cpp" +#include "../../twin/twinbindings.cpp" #include "../../kicker/kicker/core/kickerbindings.cpp" #include "../../kicker/taskbar/taskbarbindings.cpp" #include "../../kdesktop/kdesktopbindings.cpp" diff --git a/kcontrol/keys/main.cpp b/kcontrol/keys/main.cpp index d3b29fffe..a91fca234 100644 --- a/kcontrol/keys/main.cpp +++ b/kcontrol/keys/main.cpp @@ -132,7 +132,7 @@ extern "C" KDE_EXPORT KCModule *create_keys(TQWidget *parent, const char * /*name*/) { // What does this do? Why not insert klipper and kxkb, too? --ellis, 2002/01/15 - KGlobal::locale()->insertCatalogue("kwin"); + KGlobal::locale()->insertCatalogue("twin"); KGlobal::locale()->insertCatalogue("kdesktop"); KGlobal::locale()->insertCatalogue("kicker"); return new KeyModule(parent, "kcmkeys"); @@ -168,7 +168,7 @@ extern "C" #define CTRL Qt::CTRL #define ALT Qt::ALT #include "../../klipper/klipperbindings.cpp" -#include "../../kwin/kwinbindings.cpp" +#include "../../twin/twinbindings.cpp" #define KICKER_ALL_BINDINGS #include "../../kicker/kicker/core/kickerbindings.cpp" #include "../../kicker/taskbar/taskbarbindings.cpp" diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp index 68c43365e..3b17a69e1 100644 --- a/kcontrol/keys/shortcuts.cpp +++ b/kcontrol/keys/shortcuts.cpp @@ -111,7 +111,7 @@ void ShortcutsModule::initGUI() // see also KShortcutsModule::init() below !!! #define NOSLOTS #define KICKER_ALL_BINDINGS -#include "../../kwin/kwinbindings.cpp" +#include "../../twin/twinbindings.cpp" #include "../../kicker/kicker/core/kickerbindings.cpp" #include "../../kicker/taskbar/taskbarbindings.cpp" #include "../../kdesktop/kdesktopbindings.cpp" diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp index 3a72e6417..04e8c1282 100644 --- a/kcontrol/kicker/positiontab_impl.cpp +++ b/kcontrol/kicker/positiontab_impl.cpp @@ -34,7 +34,7 @@ #include <kpanelextension.h> #include <kpixmap.h> #include <kstandarddirs.h> -#include <kwin.h> +#include <twin.h> #include "main.h" #include "../background/bgrender.h" diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp index e7d333537..cf884c0be 100644 --- a/kcontrol/konq/desktop.cpp +++ b/kcontrol/konq/desktop.cpp @@ -141,30 +141,30 @@ void KDesktopConfig::load( bool useDefaults ) else groupname.sprintf("Desktops-screen-%d", konq_screen_number); - KConfig * kwinconfig = new KConfig("kwinrc"); + KConfig * twinconfig = new KConfig("twinrc"); - kwinconfig->setReadDefaults( useDefaults ); + twinconfig->setReadDefaults( useDefaults ); - kwinconfig->setGroup("Desktops"); + twinconfig->setGroup("Desktops"); for(int i = 1; i <= maxDesktops; i++) { TQString key_name(TQString("Name_") + TQString::number(i)); TQString name = TQString::fromUtf8(info.desktopName(i)); if (name.isEmpty()) // Get name from configuration if none is set in the WM. { - name = kwinconfig->readEntry(key_name, i18n("Desktop %1").arg(i)); + name = twinconfig->readEntry(key_name, i18n("Desktop %1").arg(i)); } _nameInput[i-1]->setText(name); // Is this entry immutable or not in the range of configured desktops? - _labelImmutable[i - 1] = kwinconfig->entryIsImmutable(key_name); + _labelImmutable[i - 1] = twinconfig->entryIsImmutable(key_name); _nameInput[i-1]->setEnabled(i <= n && !_labelImmutable[i - 1]); } - _numInput->setEnabled(!kwinconfig->entryIsImmutable("Number")); + _numInput->setEnabled(!twinconfig->entryIsImmutable("Number")); - delete kwinconfig; - kwinconfig = 0; + delete twinconfig; + twinconfig = 0; TQString configfile; if (konq_screen_number == 0) diff --git a/kcontrol/konq/desktop.h b/kcontrol/konq/desktop.h index 7fd06d3c6..938049628 100644 --- a/kcontrol/konq/desktop.h +++ b/kcontrol/konq/desktop.h @@ -27,7 +27,7 @@ class TQCheckBox; class KLineEdit; class KIntNumInput; -// if you change this, update also the number of keyboard shortcuts in kwin/kwinbindings.cpp +// if you change this, update also the number of keyboard shortcuts in twin/twinbindings.cpp static const int maxDesktops = 20; class KDesktopConfig : public KCModule diff --git a/kcontrol/konq/desktopbehavior.desktop b/kcontrol/konq/desktopbehavior.desktop index d20ba1ae1..904084637 100644 --- a/kcontrol/konq/desktopbehavior.desktop +++ b/kcontrol/konq/desktopbehavior.desktop @@ -212,7 +212,7 @@ Keywords[pl]=konqueror,menedżer plików,kfm,wskazówki,informacja o pliku,osobn Keywords[pt]=konqueror,gestor de ficheiros,kfm,dicas,dicas de ficheiros,janela separada,comportamento,utilização de memória,URL de base, Keywords[pt_BR]=konqueror,gerenciador de arquivos,kfm,dicas,arquivos de dicas,janelas separadas,janelas unidas,comportamento,comportamento,uso de memória,URL local, Keywords[ro]=konqueror,manager de fișiere,kfm,sfaturi,ferestre separate,comportament,utilizare memorie,URL Acasă -Keywords[rw]=Konqueror,mugengadosiye,kfm,inyobora, inyobora y'idosiye, gutandukanya Idirishya,kurema amadirishya,imyitwarire,imyitwarire,ikoresha ry'umwanyabubiko,URL y'Ipaji kwinjira, +Keywords[rw]=Konqueror,mugengadosiye,kfm,inyobora, inyobora y'idosiye, gutandukanya Idirishya,kurema amadirishya,imyitwarire,imyitwarire,ikoresha ry'umwanyabubiko,URL y'Ipaji twinjira, Keywords[se]=konqueror,fiilagieđahalli,kfm,rávvagat,fiilarávvagat,iežaš láse,ođđa láset,láhtten,muitugeavaheapmi,ruoktu-URL Keywords[sk]=konqueror,správa súborov,kfm,tipy,oddelené okná,nové okná,správanie,využitie pamäti,domovské URL Keywords[sl]=konqueror,upravitelj datotek,upravljalnik,kfm,namigi,namigi datotek,ločeno okno,ustvari okna,obnašanje,poraba pomnilnika,domači URL diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp index 49725a3af..437c74197 100644 --- a/kcontrol/konq/desktopbehavior_impl.cpp +++ b/kcontrol/konq/desktopbehavior_impl.cpp @@ -410,7 +410,7 @@ void DesktopBehavior::save() // for the standalone menubar setting kapp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data ); kapp->dcopClient()->send( "kicker", "kicker", "configureMenubar()", data ); - kapp->dcopClient()->send( "kwin*", "", "reconfigure()", data ); + kapp->dcopClient()->send( "twin*", "", "reconfigure()", data ); } void DesktopBehavior::enableChanged() diff --git a/kcontrol/konq/webbehavior.desktop b/kcontrol/konq/webbehavior.desktop index 3dfe93b69..44eed0c7c 100644 --- a/kcontrol/konq/webbehavior.desktop +++ b/kcontrol/konq/webbehavior.desktop @@ -212,7 +212,7 @@ Keywords[pl]=konqueror,menedżer plików,kfm,wskazówki,informacja o pliku,osobn Keywords[pt]=konqueror,gestor de ficheiros,kfm,dicas,dicas de ficheiros,janela separada,comportamento,utilização de memória,URL de base, Keywords[pt_BR]=konqueror,gerenciador de arquivos,kfm,dicas,arquivos de dicas,janelas separadas,janelas unidas,comportamento,comportamento,uso de memória,URL local, Keywords[ro]=konqueror,manager de fișiere,kfm,sfaturi,ferestre separate,comportament,utilizare memorie,URL Acasă -Keywords[rw]=Konqueror,mugengadosiye,kfm,inyobora, inyobora y'idosiye, gutandukanya Idirishya,kurema amadirishya,imyitwarire,imyitwarire,ikoresha ry'umwanyabubiko,URL y'Ipaji kwinjira, +Keywords[rw]=Konqueror,mugengadosiye,kfm,inyobora, inyobora y'idosiye, gutandukanya Idirishya,kurema amadirishya,imyitwarire,imyitwarire,ikoresha ry'umwanyabubiko,URL y'Ipaji twinjira, Keywords[se]=konqueror,fiilagieđahalli,kfm,rávvagat,fiilarávvagat,iežaš láse,ođđa láset,láhtten,muitugeavaheapmi,ruoktu-URL Keywords[sk]=konqueror,správa súborov,kfm,tipy,oddelené okná,nové okná,správanie,využitie pamäti,domovské URL Keywords[sl]=konqueror,upravitelj datotek,upravljalnik,kfm,namigi,namigi datotek,ločeno okno,ustvari okna,obnašanje,poraba pomnilnika,domači URL diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index dfeb7c69e..c8bd71408 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/kcontrol/krdb/krdb.cpp @@ -119,7 +119,7 @@ static void applyQtColors( KConfig& kglobals, TQSettings& settings, TQPalette& n settings.writeEntry("/qt/Palette/inactive", inactcg); settings.writeEntry("/qt/Palette/disabled", discg); - // export kwin's colors to qtrc for kstyle to use + // export twin's colors to qtrc for kstyle to use kglobals.setGroup("WM"); // active colors diff --git a/kcontrol/krdb/themes/HighContrastDark-big/HighContrastDark-big.xml b/kcontrol/krdb/themes/HighContrastDark-big/HighContrastDark-big.xml index 1c5b0a50b..3d534f9b6 100644 --- a/kcontrol/krdb/themes/HighContrastDark-big/HighContrastDark-big.xml +++ b/kcontrol/krdb/themes/HighContrastDark-big/HighContrastDark-big.xml @@ -121,21 +121,21 @@ <linkColor rgb="#ffffff" object="global" /> <visitedLinkColor rgb="#ffffff" object="global" /> <alternateBackground rgb="#000028" object="global" /> - <activeForeground rgb="#ffffff" object="kwin" /> - <inactiveBackground rgb="#1e1e1e" object="kwin" /> - <inactiveBlend rgb="#1e1e1e" object="kwin" /> - <activeBackground rgb="#00005a" object="kwin" /> - <activeBlend rgb="#00005a" object="kwin" /> - <inactiveForeground rgb="#808080" object="kwin" /> - <activeTitleBtnBg rgb="#ffffff" object="kwin" /> - <inactiveTitleBtnBg rgb="#aaaaaa" object="kwin" /> - <frame rgb="#000085" object="kwin" /> - <inactiveFrame rgb="#1e1e1e" object="kwin" /> - <handle rgb="#000085" object="kwin" /> - <inactiveHandle rgb="#1e1e1e" object="kwin" /> + <activeForeground rgb="#ffffff" object="twin" /> + <inactiveBackground rgb="#1e1e1e" object="twin" /> + <inactiveBlend rgb="#1e1e1e" object="twin" /> + <activeBackground rgb="#00005a" object="twin" /> + <activeBlend rgb="#00005a" object="twin" /> + <inactiveForeground rgb="#808080" object="twin" /> + <activeTitleBtnBg rgb="#ffffff" object="twin" /> + <inactiveTitleBtnBg rgb="#aaaaaa" object="twin" /> + <frame rgb="#000085" object="twin" /> + <inactiveFrame rgb="#1e1e1e" object="twin" /> + <handle rgb="#000085" object="twin" /> + <inactiveHandle rgb="#1e1e1e" object="twin" /> </colors> <cursors name="" /> - <wm type="builtin" name="kwin3_plastik" > + <wm type="builtin" name="twin3_plastik" > <border size="3" /> </wm> <konqueror> diff --git a/kcontrol/krdb/themes/HighContrastDark/HighContrastDark.xml b/kcontrol/krdb/themes/HighContrastDark/HighContrastDark.xml index 0dde3eb7b..2b648eac4 100644 --- a/kcontrol/krdb/themes/HighContrastDark/HighContrastDark.xml +++ b/kcontrol/krdb/themes/HighContrastDark/HighContrastDark.xml @@ -121,21 +121,21 @@ <linkColor rgb="#ffffff" object="global" /> <visitedLinkColor rgb="#ffffff" object="global" /> <alternateBackground rgb="#000028" object="global" /> - <activeForeground rgb="#ffffff" object="kwin" /> - <inactiveBackground rgb="#1e1e1e" object="kwin" /> - <inactiveBlend rgb="#1e1e1e" object="kwin" /> - <activeBackground rgb="#00005a" object="kwin" /> - <activeBlend rgb="#00005a" object="kwin" /> - <inactiveForeground rgb="#808080" object="kwin" /> - <activeTitleBtnBg rgb="#ffffff" object="kwin" /> - <inactiveTitleBtnBg rgb="#aaaaaa" object="kwin" /> - <frame rgb="#000085" object="kwin" /> - <inactiveFrame rgb="#1e1e1e" object="kwin" /> - <handle rgb="#000085" object="kwin" /> - <inactiveHandle rgb="#1e1e1e" object="kwin" /> + <activeForeground rgb="#ffffff" object="twin" /> + <inactiveBackground rgb="#1e1e1e" object="twin" /> + <inactiveBlend rgb="#1e1e1e" object="twin" /> + <activeBackground rgb="#00005a" object="twin" /> + <activeBlend rgb="#00005a" object="twin" /> + <inactiveForeground rgb="#808080" object="twin" /> + <activeTitleBtnBg rgb="#ffffff" object="twin" /> + <inactiveTitleBtnBg rgb="#aaaaaa" object="twin" /> + <frame rgb="#000085" object="twin" /> + <inactiveFrame rgb="#1e1e1e" object="twin" /> + <handle rgb="#000085" object="twin" /> + <inactiveHandle rgb="#1e1e1e" object="twin" /> </colors> <cursors name="" /> - <wm type="builtin" name="kwin3_plastik" > + <wm type="builtin" name="twin3_plastik" > <border size="3" /> </wm> <konqueror> diff --git a/kcontrol/krdb/themes/HighContrastLight-big/HighContrastLight-big.xml b/kcontrol/krdb/themes/HighContrastLight-big/HighContrastLight-big.xml index 6f9b75099..a93aba33a 100644 --- a/kcontrol/krdb/themes/HighContrastLight-big/HighContrastLight-big.xml +++ b/kcontrol/krdb/themes/HighContrastLight-big/HighContrastLight-big.xml @@ -121,21 +121,21 @@ <linkColor rgb="#000000" object="global" /> <visitedLinkColor rgb="#000000" object="global" /> <alternateBackground rgb="#d7d7ff" object="global" /> - <activeForeground rgb="#000000" object="kwin" /> - <inactiveBackground rgb="#e1e1e1" object="kwin" /> - <inactiveBlend rgb="#e1e1e1" object="kwin" /> - <activeBackground rgb="#a5a5ff" object="kwin" /> - <activeBlend rgb="#a5a5ff" object="kwin" /> - <inactiveForeground rgb="#808080" object="kwin" /> - <activeTitleBtnBg rgb="#000000" object="kwin" /> - <inactiveTitleBtnBg rgb="#555555" object="kwin" /> - <frame rgb="#7a7aff" object="kwin" /> - <inactiveFrame rgb="#e1e1e1" object="kwin" /> - <handle rgb="#7a7aff" object="kwin" /> - <inactiveHandle rgb="#e1e1e1" object="kwin" /> + <activeForeground rgb="#000000" object="twin" /> + <inactiveBackground rgb="#e1e1e1" object="twin" /> + <inactiveBlend rgb="#e1e1e1" object="twin" /> + <activeBackground rgb="#a5a5ff" object="twin" /> + <activeBlend rgb="#a5a5ff" object="twin" /> + <inactiveForeground rgb="#808080" object="twin" /> + <activeTitleBtnBg rgb="#000000" object="twin" /> + <inactiveTitleBtnBg rgb="#555555" object="twin" /> + <frame rgb="#7a7aff" object="twin" /> + <inactiveFrame rgb="#e1e1e1" object="twin" /> + <handle rgb="#7a7aff" object="twin" /> + <inactiveHandle rgb="#e1e1e1" object="twin" /> </colors> <cursors name="" /> - <wm type="builtin" name="kwin3_plastik" > + <wm type="builtin" name="twin3_plastik" > <border size="3" /> </wm> <konqueror> diff --git a/kcontrol/krdb/themes/HighContrastLight/HighContrastLight.xml b/kcontrol/krdb/themes/HighContrastLight/HighContrastLight.xml index 01b3001d9..602f21613 100644 --- a/kcontrol/krdb/themes/HighContrastLight/HighContrastLight.xml +++ b/kcontrol/krdb/themes/HighContrastLight/HighContrastLight.xml @@ -121,21 +121,21 @@ <linkColor rgb="#000000" object="global" /> <visitedLinkColor rgb="#000000" object="global" /> <alternateBackground rgb="#d7d7ff" object="global" /> - <activeForeground rgb="#000000" object="kwin" /> - <inactiveBackground rgb="#e1e1e1" object="kwin" /> - <inactiveBlend rgb="#e1e1e1" object="kwin" /> - <activeBackground rgb="#a5a5ff" object="kwin" /> - <activeBlend rgb="#a5a5ff" object="kwin" /> - <inactiveForeground rgb="#808080" object="kwin" /> - <activeTitleBtnBg rgb="#000000" object="kwin" /> - <inactiveTitleBtnBg rgb="#555555" object="kwin" /> - <frame rgb="#7a7aff" object="kwin" /> - <inactiveFrame rgb="#e1e1e1" object="kwin" /> - <handle rgb="#7a7aff" object="kwin" /> - <inactiveHandle rgb="#e1e1e1" object="kwin" /> + <activeForeground rgb="#000000" object="twin" /> + <inactiveBackground rgb="#e1e1e1" object="twin" /> + <inactiveBlend rgb="#e1e1e1" object="twin" /> + <activeBackground rgb="#a5a5ff" object="twin" /> + <activeBlend rgb="#a5a5ff" object="twin" /> + <inactiveForeground rgb="#808080" object="twin" /> + <activeTitleBtnBg rgb="#000000" object="twin" /> + <inactiveTitleBtnBg rgb="#555555" object="twin" /> + <frame rgb="#7a7aff" object="twin" /> + <inactiveFrame rgb="#e1e1e1" object="twin" /> + <handle rgb="#7a7aff" object="twin" /> + <inactiveHandle rgb="#e1e1e1" object="twin" /> </colors> <cursors name="" /> - <wm type="builtin" name="kwin3_plastik" > + <wm type="builtin" name="twin3_plastik" > <border size="1" /> </wm> <konqueror> diff --git a/kcontrol/krdb/themes/KDE_Classic/KDE_Classic.xml b/kcontrol/krdb/themes/KDE_Classic/KDE_Classic.xml index 78d258374..4164a5e55 100644 --- a/kcontrol/krdb/themes/KDE_Classic/KDE_Classic.xml +++ b/kcontrol/krdb/themes/KDE_Classic/KDE_Classic.xml @@ -90,17 +90,17 @@ <buttonForeground rgb="#000000" object="global" /> <linkColor rgb="#0000c0" object="global" /> <visitedLinkColor rgb="#800080" object="global" /> - <activeForeground rgb="#ffffff" object="kwin" /> - <inactiveBackground rgb="#dcdcdc" object="kwin" /> - <inactiveBlend rgb="#dcdcdc" object="kwin" /> - <activeBackground rgb="#0a5f89" object="kwin" /> - <activeBlend rgb="#0a5f89" object="kwin" /> - <inactiveForeground rgb="#000000" object="kwin" /> - <activeTitleBtnBg rgb="#c0c0c0" object="kwin" /> - <inactiveTitleBtnBg rgb="#a7b5c7" object="kwin" /> + <activeForeground rgb="#ffffff" object="twin" /> + <inactiveBackground rgb="#dcdcdc" object="twin" /> + <inactiveBlend rgb="#dcdcdc" object="twin" /> + <activeBackground rgb="#0a5f89" object="twin" /> + <activeBlend rgb="#0a5f89" object="twin" /> + <inactiveForeground rgb="#000000" object="twin" /> + <activeTitleBtnBg rgb="#c0c0c0" object="twin" /> + <inactiveTitleBtnBg rgb="#a7b5c7" object="twin" /> </colors> <cursors name="" /> - <wm type="builtin" name="kwin3_default" > + <wm type="builtin" name="twin3_default" > <border size="1" /> </wm> <konqueror> diff --git a/kcontrol/krdb/themes/Keramik/Keramik.xml b/kcontrol/krdb/themes/Keramik/Keramik.xml index cd50d7b56..6e38bbf0e 100644 --- a/kcontrol/krdb/themes/Keramik/Keramik.xml +++ b/kcontrol/krdb/themes/Keramik/Keramik.xml @@ -90,17 +90,17 @@ <buttonForeground rgb="#000000" object="global" /> <linkColor rgb="#0000c0" object="global" /> <visitedLinkColor rgb="#800080" object="global" /> - <activeForeground rgb="#ffffff" object="kwin" /> - <inactiveBackground rgb="#afd6ff" object="kwin" /> - <inactiveBlend rgb="#afd6ff" object="kwin" /> - <activeBackground rgb="#3e91eb" object="kwin" /> - <activeBlend rgb="#3e91eb" object="kwin" /> - <inactiveForeground rgb="#ffffff" object="kwin" /> - <activeTitleBtnBg rgb="#dcdcdc" object="kwin" /> - <inactiveTitleBtnBg rgb="#dcdcdc" object="kwin" /> + <activeForeground rgb="#ffffff" object="twin" /> + <inactiveBackground rgb="#afd6ff" object="twin" /> + <inactiveBlend rgb="#afd6ff" object="twin" /> + <activeBackground rgb="#3e91eb" object="twin" /> + <activeBlend rgb="#3e91eb" object="twin" /> + <inactiveForeground rgb="#ffffff" object="twin" /> + <activeTitleBtnBg rgb="#dcdcdc" object="twin" /> + <inactiveTitleBtnBg rgb="#dcdcdc" object="twin" /> </colors> <cursors name="" /> - <wm type="builtin" name="kwin3_keramik" > + <wm type="builtin" name="twin3_keramik" > <border size="1" /> </wm> <konqueror> diff --git a/kcontrol/krdb/themes/Plastik/Plastik.xml b/kcontrol/krdb/themes/Plastik/Plastik.xml index 53b115550..bc4f62c1e 100644 --- a/kcontrol/krdb/themes/Plastik/Plastik.xml +++ b/kcontrol/krdb/themes/Plastik/Plastik.xml @@ -90,17 +90,17 @@ <buttonForeground rgb="#000000" object="global" /> <linkColor rgb="#0000ee" object="global" /> <visitedLinkColor rgb="#52188b" object="global" /> - <activeForeground rgb="#ffffff" object="kwin" /> - <inactiveBackground rgb="#9daaba" object="kwin" /> - <inactiveBlend rgb="#9daaba" object="kwin" /> - <activeBackground rgb="#418edc" object="kwin" /> - <activeBlend rgb="#6b91b8" object="kwin" /> - <inactiveForeground rgb="#dddddd" object="kwin" /> - <activeTitleBtnBg rgb="#dcdcdc" object="kwin" /> - <inactiveTitleBtnBg rgb="#dcdcdc" object="kwin" /> + <activeForeground rgb="#ffffff" object="twin" /> + <inactiveBackground rgb="#9daaba" object="twin" /> + <inactiveBlend rgb="#9daaba" object="twin" /> + <activeBackground rgb="#418edc" object="twin" /> + <activeBlend rgb="#6b91b8" object="twin" /> + <inactiveForeground rgb="#dddddd" object="twin" /> + <activeTitleBtnBg rgb="#dcdcdc" object="twin" /> + <inactiveTitleBtnBg rgb="#dcdcdc" object="twin" /> </colors> <cursors name="" /> - <wm type="builtin" name="kwin3_plastik" > + <wm type="builtin" name="twin3_plastik" > <border size="1" /> </wm> <konqueror> diff --git a/kcontrol/krdb/themes/Platinum/Platinum.xml b/kcontrol/krdb/themes/Platinum/Platinum.xml index 2fc50ba36..415ad177a 100644 --- a/kcontrol/krdb/themes/Platinum/Platinum.xml +++ b/kcontrol/krdb/themes/Platinum/Platinum.xml @@ -90,17 +90,17 @@ <buttonForeground rgb="#000000" object="global" /> <linkColor rgb="#0000c0" object="global" /> <visitedLinkColor rgb="#800080" object="global" /> - <activeForeground rgb="#020202" object="kwin" /> - <inactiveBackground rgb="#96a7ca" object="kwin" /> - <inactiveBlend rgb="#9db0d0" object="kwin" /> - <activeBackground rgb="#e9e9e9" object="kwin" /> - <activeBlend rgb="#e9e9e9" object="kwin" /> - <inactiveForeground rgb="#5d7091" object="kwin" /> - <activeTitleBtnBg rgb="#dcdcdc" object="kwin" /> - <inactiveTitleBtnBg rgb="#dcdcdc" object="kwin" /> + <activeForeground rgb="#020202" object="twin" /> + <inactiveBackground rgb="#96a7ca" object="twin" /> + <inactiveBlend rgb="#9db0d0" object="twin" /> + <activeBackground rgb="#e9e9e9" object="twin" /> + <activeBlend rgb="#e9e9e9" object="twin" /> + <inactiveForeground rgb="#5d7091" object="twin" /> + <activeTitleBtnBg rgb="#dcdcdc" object="twin" /> + <inactiveTitleBtnBg rgb="#dcdcdc" object="twin" /> </colors> <cursors name="" /> - <wm type="builtin" name="kwin3_system" > + <wm type="builtin" name="twin3_system" > <border size="1" /> </wm> <konqueror> diff --git a/kcontrol/krdb/themes/Redmond/Redmond.xml b/kcontrol/krdb/themes/Redmond/Redmond.xml index 4ec27ceee..629ddc78f 100644 --- a/kcontrol/krdb/themes/Redmond/Redmond.xml +++ b/kcontrol/krdb/themes/Redmond/Redmond.xml @@ -90,17 +90,17 @@ <buttonForeground rgb="#000000" object="global" /> <linkColor rgb="#0000c0" object="global" /> <visitedLinkColor rgb="#800080" object="global" /> - <activeForeground rgb="#ffffff" object="kwin" /> - <inactiveBackground rgb="#dcdcdc" object="kwin" /> - <inactiveBlend rgb="#dcdcdc" object="kwin" /> - <activeBackground rgb="#002468" object="kwin" /> - <activeBlend rgb="#a8ccf0" object="kwin" /> - <inactiveForeground rgb="#000000" object="kwin" /> - <activeTitleBtnBg rgb="#dcdcdc" object="kwin" /> - <inactiveTitleBtnBg rgb="#dcdcdc" object="kwin" /> + <activeForeground rgb="#ffffff" object="twin" /> + <inactiveBackground rgb="#dcdcdc" object="twin" /> + <inactiveBlend rgb="#dcdcdc" object="twin" /> + <activeBackground rgb="#002468" object="twin" /> + <activeBlend rgb="#a8ccf0" object="twin" /> + <inactiveForeground rgb="#000000" object="twin" /> + <activeTitleBtnBg rgb="#dcdcdc" object="twin" /> + <inactiveTitleBtnBg rgb="#dcdcdc" object="twin" /> </colors> <cursors name="" /> - <wm type="builtin" name="kwin3_redmond" > + <wm type="builtin" name="twin3_redmond" > <border size="1" /> </wm> <konqueror> diff --git a/kcontrol/krdb/themes/Sunshine/Sunshine.xml b/kcontrol/krdb/themes/Sunshine/Sunshine.xml index 92a4a8bf0..00fe8f06a 100644 --- a/kcontrol/krdb/themes/Sunshine/Sunshine.xml +++ b/kcontrol/krdb/themes/Sunshine/Sunshine.xml @@ -90,17 +90,17 @@ <buttonForeground rgb="#000000" object="global" /> <linkColor rgb="#0000ff" object="global" /> <visitedLinkColor rgb="#c0ffff" object="global" /> - <activeForeground rgb="#ffffff" object="kwin" /> - <inactiveBackground rgb="#aeb2c3" object="kwin" /> - <inactiveBlend rgb="#aeb2c3" object="kwin" /> - <activeBackground rgb="#b24d7a" object="kwin" /> - <activeBlend rgb="#aeb2c3" object="kwin" /> - <inactiveForeground rgb="#000000" object="kwin" /> - <activeTitleBtnBg rgb="#aeb2c3" object="kwin" /> - <inactiveTitleBtnBg rgb="#aeb2c3" object="kwin" /> + <activeForeground rgb="#ffffff" object="twin" /> + <inactiveBackground rgb="#aeb2c3" object="twin" /> + <inactiveBlend rgb="#aeb2c3" object="twin" /> + <activeBackground rgb="#b24d7a" object="twin" /> + <activeBlend rgb="#aeb2c3" object="twin" /> + <inactiveForeground rgb="#000000" object="twin" /> + <activeTitleBtnBg rgb="#aeb2c3" object="twin" /> + <inactiveTitleBtnBg rgb="#aeb2c3" object="twin" /> </colors> <cursors name="" /> - <wm type="builtin" name="kwin3_cde" > + <wm type="builtin" name="twin3_cde" > <border size="1" /> </wm> <konqueror> diff --git a/kcontrol/krdb/themes/YellowOnBlue-big/YellowOnBlue-big.xml b/kcontrol/krdb/themes/YellowOnBlue-big/YellowOnBlue-big.xml index 20138db4a..3a7332628 100644 --- a/kcontrol/krdb/themes/YellowOnBlue-big/YellowOnBlue-big.xml +++ b/kcontrol/krdb/themes/YellowOnBlue-big/YellowOnBlue-big.xml @@ -121,21 +121,21 @@ <linkColor rgb="#ffff00" object="global" /> <visitedLinkColor rgb="#ffff00" object="global" /> <alternateBackground rgb="#0000d7" object="global" /> - <activeForeground rgb="#ffff00" object="kwin" /> - <inactiveBackground rgb="#1e1ee1" object="kwin" /> - <inactiveBlend rgb="#1e1ee1" object="kwin" /> - <activeBackground rgb="#0000b4" object="kwin" /> - <activeBlend rgb="#0000b4" object="kwin" /> - <inactiveForeground rgb="#808080" object="kwin" /> - <activeTitleBtnBg rgb="#ffff00" object="kwin" /> - <inactiveTitleBtnBg rgb="#aaaa55" object="kwin" /> - <frame rgb="#00007a" object="kwin" /> - <inactiveFrame rgb="#1e1ee1" object="kwin" /> - <handle rgb="#00007a" object="kwin" /> - <inactiveHandle rgb="#1e1ee1" object="kwin" /> + <activeForeground rgb="#ffff00" object="twin" /> + <inactiveBackground rgb="#1e1ee1" object="twin" /> + <inactiveBlend rgb="#1e1ee1" object="twin" /> + <activeBackground rgb="#0000b4" object="twin" /> + <activeBlend rgb="#0000b4" object="twin" /> + <inactiveForeground rgb="#808080" object="twin" /> + <activeTitleBtnBg rgb="#ffff00" object="twin" /> + <inactiveTitleBtnBg rgb="#aaaa55" object="twin" /> + <frame rgb="#00007a" object="twin" /> + <inactiveFrame rgb="#1e1ee1" object="twin" /> + <handle rgb="#00007a" object="twin" /> + <inactiveHandle rgb="#1e1ee1" object="twin" /> </colors> <cursors name="" /> - <wm type="builtin" name="kwin3_quartz" > + <wm type="builtin" name="twin3_quartz" > <border size="1" /> </wm> <konqueror> diff --git a/kcontrol/krdb/themes/YellowOnBlue/YellowOnBlue.xml b/kcontrol/krdb/themes/YellowOnBlue/YellowOnBlue.xml index a1e6fd5e4..c624bbb6e 100644 --- a/kcontrol/krdb/themes/YellowOnBlue/YellowOnBlue.xml +++ b/kcontrol/krdb/themes/YellowOnBlue/YellowOnBlue.xml @@ -121,21 +121,21 @@ <linkColor rgb="#ffff00" object="global" /> <visitedLinkColor rgb="#ffff00" object="global" /> <alternateBackground rgb="#0000d7" object="global" /> - <activeForeground rgb="#ffff00" object="kwin" /> - <inactiveBackground rgb="#1e1ee1" object="kwin" /> - <inactiveBlend rgb="#1e1ee1" object="kwin" /> - <activeBackground rgb="#0000b4" object="kwin" /> - <activeBlend rgb="#0000b4" object="kwin" /> - <inactiveForeground rgb="#808080" object="kwin" /> - <activeTitleBtnBg rgb="#ffff00" object="kwin" /> - <inactiveTitleBtnBg rgb="#aaaa55" object="kwin" /> - <frame rgb="#00007a" object="kwin" /> - <inactiveFrame rgb="#1e1ee1" object="kwin" /> - <handle rgb="#00007a" object="kwin" /> - <inactiveHandle rgb="#1e1ee1" object="kwin" /> + <activeForeground rgb="#ffff00" object="twin" /> + <inactiveBackground rgb="#1e1ee1" object="twin" /> + <inactiveBlend rgb="#1e1ee1" object="twin" /> + <activeBackground rgb="#0000b4" object="twin" /> + <activeBlend rgb="#0000b4" object="twin" /> + <inactiveForeground rgb="#808080" object="twin" /> + <activeTitleBtnBg rgb="#ffff00" object="twin" /> + <inactiveTitleBtnBg rgb="#aaaa55" object="twin" /> + <frame rgb="#00007a" object="twin" /> + <inactiveFrame rgb="#1e1ee1" object="twin" /> + <handle rgb="#00007a" object="twin" /> + <inactiveHandle rgb="#1e1ee1" object="twin" /> </colors> <cursors name="" /> - <wm type="builtin" name="kwin3_quartz" > + <wm type="builtin" name="twin3_quartz" > <border size="1" /> </wm> <konqueror> diff --git a/kcontrol/kthememanager/README b/kcontrol/kthememanager/README index 0fe235115..cd32a528a 100644 --- a/kcontrol/kthememanager/README +++ b/kcontrol/kthememanager/README @@ -44,15 +44,15 @@ Sample XML theme config file: </desktop> <icons name="crystalsvg" /> <sounds> - <event object="global|kwin" name="eventname" url="theme:/sounds/file.wav" /> + <event object="global|twin" name="eventname" url="theme:/sounds/file.wav" /> ... </sounds> <colors contrast="7"> - <alternateBackground rgb="#123456" object="global|kwin"/> + <alternateBackground rgb="#123456" object="global|twin"/> ... </colors> <cursors name="theme_name" /> -<wm type="builtin|custom" name="kwin_lib_name"> +<wm type="builtin|custom" name="twin_lib_name"> <buttons left="M" right="HIAX" /> <border size="number" /> </wm> diff --git a/kcontrol/kthememanager/TODO b/kcontrol/kthememanager/TODO index 944f79b78..d19cf03f2 100644 --- a/kcontrol/kthememanager/TODO +++ b/kcontrol/kthememanager/TODO @@ -1,5 +1,5 @@ - use KHotNewStuff for directly downloading themes from kde-look.org -- custom pixmap kwin themes (requires kwmtheme to be ported first) +- custom pixmap twin themes (requires kwmtheme to be ported first) - write user and theme developer documentation Handle: diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp index 5396d9e2b..3b82e889e 100644 --- a/kcontrol/kthememanager/ktheme.cpp +++ b/kcontrol/kthememanager/ktheme.cpp @@ -127,9 +127,9 @@ TQString KTheme::createYourself( bool pack ) // 2. Background theme KConfig * globalConf = KGlobal::config(); - KConfig kwinConf( "kwinrc", true ); - kwinConf.setGroup( "Desktops" ); - uint numDesktops = kwinConf.readUnsignedNumEntry( "Number", 4 ); + KConfig twinConf( "twinrc", true ); + twinConf.setGroup( "Desktops" ); + uint numDesktops = twinConf.readUnsignedNumEntry( "Number", 4 ); KConfig desktopConf( "kdesktoprc", true ); desktopConf.setGroup( "Background Common" ); @@ -205,9 +205,9 @@ TQString KTheme::createYourself( bool pack ) << "messageboxQuestion"; // 4.2 KWin sounds - KConfig * kwinSoundConf = new KConfig( "kwin.eventsrc", true ); - TQStringList kwinEvents; - kwinEvents << "activate" << "close" << "delete" << + KConfig * twinSoundConf = new KConfig( "twin.eventsrc", true ); + TQStringList twinEvents; + twinEvents << "activate" << "close" << "delete" << "desktop1" << "desktop2" << "desktop3" << "desktop4" << "desktop5" << "desktop6" << "desktop7" << "desktop8" << "maximize" << "minimize" << "moveend" << "movestart" << @@ -217,10 +217,10 @@ TQString KTheme::createYourself( bool pack ) TQDomElement soundsElem = m_dom.createElement( "sounds" ); createSoundList( stdEvents, "global", soundsElem, soundConf ); - createSoundList( kwinEvents, "kwin", soundsElem, kwinSoundConf ); + createSoundList( twinEvents, "twin", soundsElem, twinSoundConf ); m_root.appendChild( soundsElem ); delete soundConf; - delete kwinSoundConf; + delete twinSoundConf; // 5. Colors @@ -236,13 +236,13 @@ TQString KTheme::createYourself( bool pack ) for ( TQStringList::Iterator it = stdColors.begin(); it != stdColors.end(); ++it ) createColorElem( ( *it ), "global", colorsElem, globalConf ); - TQStringList kwinColors; - kwinColors << "activeForeground" << "inactiveBackground" << "inactiveBlend" << "activeBackground" + TQStringList twinColors; + twinColors << "activeForeground" << "inactiveBackground" << "inactiveBlend" << "activeBackground" << "activeBlend" << "inactiveForeground" << "activeTitleBtnBg" << "inactiveTitleBtnBg" << "frame" << "inactiveFrame" << "handle" << "inactiveHandle"; globalConf->setGroup( "WM" ); - for ( TQStringList::Iterator it = kwinColors.begin(); it != kwinColors.end(); ++it ) - createColorElem( ( *it ), "kwin", colorsElem, globalConf ); + for ( TQStringList::Iterator it = twinColors.begin(); it != twinColors.end(); ++it ) + createColorElem( ( *it ), "twin", colorsElem, globalConf ); m_root.appendChild( colorsElem ); @@ -256,19 +256,19 @@ TQString KTheme::createYourself( bool pack ) // TODO copy the cursor theme? // 7. KWin - kwinConf.setGroup( "Style" ); + twinConf.setGroup( "Style" ); TQDomElement wmElem = m_dom.createElement( "wm" ); - wmElem.setAttribute( "name", kwinConf.readEntry( "PluginLib" ) ); - wmElem.setAttribute( "type", "builtin" ); // TODO support pixmap themes when the kwin client gets ported - if ( kwinConf.readBoolEntry( "CustomButtonPositions" ) ) + wmElem.setAttribute( "name", twinConf.readEntry( "PluginLib" ) ); + wmElem.setAttribute( "type", "builtin" ); // TODO support pixmap themes when the twin client gets ported + if ( twinConf.readBoolEntry( "CustomButtonPositions" ) ) { TQDomElement buttonsElem = m_dom.createElement( "buttons" ); - buttonsElem.setAttribute( "left", kwinConf.readEntry( "ButtonsOnLeft" ) ); - buttonsElem.setAttribute( "right", kwinConf.readEntry( "ButtonsOnRight" ) ); + buttonsElem.setAttribute( "left", twinConf.readEntry( "ButtonsOnLeft" ) ); + buttonsElem.setAttribute( "right", twinConf.readEntry( "ButtonsOnRight" ) ); wmElem.appendChild( buttonsElem ); } TQDomElement borderElem = m_dom.createElement( "border" ); - borderElem.setAttribute( "size", kwinConf.readNumEntry( "BorderSize", 1 ) ); + borderElem.setAttribute( "size", twinConf.readNumEntry( "BorderSize", 1 ) ); wmElem.appendChild( borderElem ); m_root.appendChild( wmElem ); @@ -493,7 +493,7 @@ void KTheme::apply() if ( !soundsElem.isNull() ) { KConfig soundConf( "knotify.eventsrc" ); - KConfig kwinSoundConf( "kwin.eventsrc" ); + KConfig twinSoundConf( "twin.eventsrc" ); TQDomNodeList eventList = soundsElem.elementsByTagName( "event" ); for ( uint i = 0; i < eventList.count(); i++ ) { @@ -506,18 +506,18 @@ void KTheme::apply() soundConf.writeEntry( "soundfile", unprocessFilePath( "sounds", eventElem.attribute( "url" ) ) ); soundConf.writeEntry( "presentation", soundConf.readNumEntry( "presentation" ) | 1 ); } - else if ( object == "kwin" ) + else if ( object == "twin" ) { - kwinSoundConf.setGroup( eventElem.attribute( "name" ) ); - kwinSoundConf.writeEntry( "soundfile", unprocessFilePath( "sounds", eventElem.attribute( "url" ) ) ); - kwinSoundConf.writeEntry( "presentation", soundConf.readNumEntry( "presentation" ) | 1 ); + twinSoundConf.setGroup( eventElem.attribute( "name" ) ); + twinSoundConf.writeEntry( "soundfile", unprocessFilePath( "sounds", eventElem.attribute( "url" ) ) ); + twinSoundConf.writeEntry( "presentation", soundConf.readNumEntry( "presentation" ) | 1 ); } } soundConf.sync(); - kwinSoundConf.sync(); + twinSoundConf.sync(); client->send("knotify", "", "reconfigure()", TQString("")); - // TODO signal kwin sounds change? + // TODO signal twin sounds change? } // 5. Colors @@ -538,7 +538,7 @@ void KTheme::apply() TQString object = colorElem.attribute( "object" ); if ( object == "global" ) colorConf->setGroup( "General" ); - else if ( object == "kwin" ) + else if ( object == "twin" ) colorConf->setGroup( "WM" ); TQString colName = colorElem.tagName(); @@ -573,27 +573,27 @@ void KTheme::apply() if ( !wmElem.isNull() ) { - KConfig kwinConf( "kwinrc" ); - kwinConf.setGroup( "Style" ); + KConfig twinConf( "twinrc" ); + twinConf.setGroup( "Style" ); TQString type = wmElem.attribute( "type" ); if ( type == "builtin" ) - kwinConf.writeEntry( "PluginLib", wmElem.attribute( "name" ) ); + twinConf.writeEntry( "PluginLib", wmElem.attribute( "name" ) ); //else // TODO support custom themes TQDomNodeList buttons = wmElem.elementsByTagName ("buttons"); if ( buttons.count() > 0 ) { - kwinConf.writeEntry( "CustomButtonPositions", true ); - kwinConf.writeEntry( "ButtonsOnLeft", getProperty( wmElem, "buttons", "left" ) ); - kwinConf.writeEntry( "ButtonsOnRight", getProperty( wmElem, "buttons", "right" ) ); + twinConf.writeEntry( "CustomButtonPositions", true ); + twinConf.writeEntry( "ButtonsOnLeft", getProperty( wmElem, "buttons", "left" ) ); + twinConf.writeEntry( "ButtonsOnRight", getProperty( wmElem, "buttons", "right" ) ); } else { - kwinConf.writeEntry( "CustomButtonPositions", false ); + twinConf.writeEntry( "CustomButtonPositions", false ); } - kwinConf.writeEntry( "BorderSize", getProperty( wmElem, "border", "size" ) ); + twinConf.writeEntry( "BorderSize", getProperty( wmElem, "border", "size" ) ); - kwinConf.sync(); - client->send( "kwin", "", "reconfigure()", TQString("") ); + twinConf.sync(); + client->send( "twin", "", "reconfigure()", TQString("") ); } // 8. Konqueror diff --git a/kcontrol/kthememanager/ktheme.h b/kcontrol/kthememanager/ktheme.h index 0ec3c94cf..6ba23f535 100644 --- a/kcontrol/kthememanager/ktheme.h +++ b/kcontrol/kthememanager/ktheme.h @@ -171,7 +171,7 @@ private: /** * Creates a list of "event" elements based on: * @param events The list of events to work on - * @param object Specifier (currently "global" or "kwin") + * @param object Specifier (currently "global" or "twin") * @param parent Parent element to append to * @param cfg The KConfig object to work with */ diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp index f48d621cf..0529eb91d 100644 --- a/kcontrol/randr/configdialog.cpp +++ b/kcontrol/randr/configdialog.cpp @@ -29,7 +29,7 @@ #include <kiconloader.h> #include <klocale.h> #include <kpopupmenu.h> -#include <kwinmodule.h> +#include <twinmodule.h> #include <kregexpeditorinterface.h> #include <kparts/componentfactory.h> diff --git a/kcontrol/randr/ktimerdialog.cpp b/kcontrol/randr/ktimerdialog.cpp index eb8ddbd7f..baada1f1f 100644 --- a/kcontrol/randr/ktimerdialog.cpp +++ b/kcontrol/randr/ktimerdialog.cpp @@ -26,7 +26,7 @@ #include <qprogressbar.h> #include <qlabel.h> -#include <kwin.h> +#include <twin.h> #include <kiconloader.h> #include <klocale.h> diff --git a/kcontrol/screensaver/kswidget.cpp b/kcontrol/screensaver/kswidget.cpp index ed0c8b2cf..cb5760fcc 100644 --- a/kcontrol/screensaver/kswidget.cpp +++ b/kcontrol/screensaver/kswidget.cpp @@ -1,6 +1,6 @@ #include <config.h> -#include <kwin.h> +#include <twin.h> #include "testwin.h" #ifdef HAVE_GLXCHOOSEVISUAL diff --git a/kcontrol/screensaver/testwin.cpp b/kcontrol/screensaver/testwin.cpp index 3676c0db7..dd250e084 100644 --- a/kcontrol/screensaver/testwin.cpp +++ b/kcontrol/screensaver/testwin.cpp @@ -1,4 +1,4 @@ -#include <kwin.h> +#include <twin.h> #include "testwin.h" class QXEmbed; diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index ba6559c1b..ecfd6fea9 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/kcontrol/style/kcmstyle.cpp @@ -649,7 +649,7 @@ void KCMStyle::save() if (m_bEffectsDirty) { KIPC::sendMessageAll(KIPC::SettingsChanged); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); + kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); } //update kicker to re-used tooltips kicker parameter otherwise, it overwritted //by style tooltips parameters. diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp index a13963e09..a07189cde 100644 --- a/kcontrol/taskbar/kcmtaskbar.cpp +++ b/kcontrol/taskbar/kcmtaskbar.cpp @@ -29,7 +29,7 @@ #include <kconfig.h> #include <kdialog.h> #include <kgenericfactory.h> -#include <kwin.h> +#include <twin.h> #include <kcolorbutton.h> #include <tqlabel.h> diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp index d7219e17e..cedbd42fd 100644 --- a/kcontrol/xinerama/kcmxinerama.cpp +++ b/kcontrol/xinerama/kcmxinerama.cpp @@ -29,7 +29,7 @@ #include <kglobalsettings.h> #include <klocale.h> #include <kmessagebox.h> -#include <kwin.h> +#include <twin.h> #include <tqcheckbox.h> #include <tqlayout.h> @@ -177,7 +177,7 @@ void KCMXinerama::save() { if (!kapp->dcopClient()->isAttached()) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin", "", "reconfigure()", TQString("")); + kapp->dcopClient()->send("twin", "", "reconfigure()", TQString("")); ksplashrc->setGroup("Xinerama"); ksplashrc->writeEntry("KSplashScreen", xw->_enableXinerama->isChecked() ? xw->_ksplashDisplay->currentItem() : -2 /* ignore Xinerama */); diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc index a3f58c2eb..a643905eb 100644 --- a/kdesktop/bgmanager.cc +++ b/kdesktop/bgmanager.cc @@ -23,12 +23,12 @@ #include <kiconloader.h> #include <kconfig.h> -#include <kwin.h> +#include <twin.h> #include <kapplication.h> #include <kdebug.h> #include <kipc.h> #include <kpopupmenu.h> -#include <kwinmodule.h> +#include <twinmodule.h> #include <krootpixmap.h> #include <X11/X.h> @@ -59,7 +59,7 @@ extern KDesktopApp *myApp; /**** KBackgroundManager ****/ -KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* kwinModule) +KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule) : KBackgroundIface() { if( !properties_inited ) @@ -80,7 +80,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* kwinModule m_Serial = 0; m_Hash = 0; m_pConfig = KGlobal::config(); m_bExport = m_bCommon = m_bInit = false; - m_pKwinmodule = kwinModule; + m_pKwinmodule = twinModule; m_pPixmapServer = new KPixmapServer(); m_xrootpmap = None; diff --git a/kdesktop/bgmanager.h b/kdesktop/bgmanager.h index 080c5a614..529944700 100644 --- a/kdesktop/bgmanager.h +++ b/kdesktop/bgmanager.h @@ -57,7 +57,7 @@ class KBackgroundManager TQ_OBJECT public: - KBackgroundManager(TQWidget *desktop, KWinModule* kwinModule); + KBackgroundManager(TQWidget *desktop, KWinModule* twinModule); ~KBackgroundManager(); void configure(); diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc index 2f6e3831f..c6edea06f 100644 --- a/kdesktop/desktop.cc +++ b/kdesktop/desktop.cc @@ -55,9 +55,9 @@ #include <ktempfile.h> #include <kmessagebox.h> #include <kglobalaccel.h> -#include <kwinmodule.h> +#include <twinmodule.h> #include <krun.h> -#include <kwin.h> +#include <twin.h> #include <kglobalsettings.h> #include <kpopupmenu.h> #include <kapplication.h> @@ -67,7 +67,7 @@ //#include <kaccelbase.h> extern int kdesktop_screen_number; -extern TQCString kdesktop_name, kicker_name, kwin_name; +extern TQCString kdesktop_name, kicker_name, twin_name; KRootWidget::KRootWidget() : TQObject() { @@ -168,7 +168,7 @@ KDesktop::KDesktop( bool x_root_hack, bool wait_for_kded ) : if ( x_root_hack ) { // this is a ugly hack to make Dnd work - // Matthias told me that it won't be necessary with kwin + // Matthias told me that it won't be necessary with twin // actually my first try with ICCCM (Dirk) :-) unsigned long data[2]; data[0] = (unsigned long) 1; @@ -318,7 +318,7 @@ KDesktop::initRoot() } else // we are not called from the ctor, so kicker should already run { - area = kwinModule()->workArea(kwinModule()->currentDesktop()); + area = twinModule()->workArea(twinModule()->currentDesktop()); m_pIconView->updateWorkArea(area); } } @@ -346,7 +346,7 @@ void KDesktop::slotNoKicker() kdDebug(1204) << "KDesktop::slotNoKicker ... kicker did not respond" << endl; // up till now, we got no desktopIconsArea from kicker - probably // it's not running, so use the area from KWinModule - m_pIconView->updateWorkArea(kwinModule()->workArea(kwinModule()->currentDesktop())); + m_pIconView->updateWorkArea(twinModule()->workArea(twinModule()->currentDesktop())); } void @@ -516,7 +516,7 @@ void KDesktop::popupExecuteCommand(const TQString& command) // Move minicli to the current desktop NETWinInfo info( qt_xdisplay(), m_miniCli->winId(), qt_xrootwin(), NET::WMDesktop ); - int currentDesktop = kwinModule()->currentDesktop(); + int currentDesktop = twinModule()->currentDesktop(); if ( info.desktop() != currentDesktop ) info.setDesktop( currentDesktop ); @@ -614,10 +614,10 @@ void KDesktop::setShowDesktop( bool b ) if (b) { - m_activeWindow = kwinModule()->activeWindow(); + m_activeWindow = twinModule()->activeWindow(); m_iconifiedList.clear(); - const TQValueList<WId> windows = kwinModule()->windows(); + const TQValueList<WId> windows = twinModule()->windows(); for (TQValueList<WId>::ConstIterator it = windows.begin(); it != windows.end(); ++it) @@ -629,7 +629,7 @@ void KDesktop::setShowDesktop( bool b ) if (info.mappingState() == NET::Visible && (info.desktop() == NETWinInfo::OnAllDesktops || - info.desktop() == (int)kwinModule()->currentDesktop())) + info.desktop() == (int)twinModule()->currentDesktop())) { m_iconifiedList.append( w ); } @@ -645,20 +645,20 @@ void KDesktop::setShowDesktop( bool b ) } // on desktop changes or when a window is deiconified, we abort the show desktop mode - connect(kwinModule(), TQT_SIGNAL(currentDesktopChanged(int)), + connect(twinModule(), TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(slotCurrentDesktopChanged(int))); - connect(kwinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)), + connect(twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)), TQT_SLOT(slotWindowChanged(WId,unsigned int))); - connect(kwinModule(), TQT_SIGNAL(windowAdded(WId)), + connect(twinModule(), TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(slotWindowAdded(WId))); } else { - disconnect(kwinModule(), TQT_SIGNAL(currentDesktopChanged(int)), + disconnect(twinModule(), TQT_SIGNAL(currentDesktopChanged(int)), this, TQT_SLOT(slotCurrentDesktopChanged(int))); - disconnect(kwinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)), + disconnect(twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)), this, TQT_SLOT(slotWindowChanged(WId,unsigned int))); - disconnect(kwinModule(), TQT_SIGNAL(windowAdded(WId)), + disconnect(twinModule(), TQT_SIGNAL(windowAdded(WId)), this, TQT_SLOT(slotWindowAdded(WId))); for (TQValueVector<WId>::ConstIterator it = m_iconifiedList.begin(); @@ -696,9 +696,9 @@ void KDesktop::slotWindowAdded(WId w) if ((windowType == NET::Normal || windowType == NET::Unknown) && inf.mappingState() == NET::Visible) { - KConfig kwincfg( "kwinrc", true ); // see in kwin - kwincfg.setGroup( "Windows" ); - if( kwincfg.readBoolEntry( "ShowDesktopIsMinimizeAll", false )) + KConfig twincfg( "twinrc", true ); // see in twin + twincfg.setGroup( "Windows" ); + if( twincfg.readBoolEntry( "ShowDesktopIsMinimizeAll", false )) { m_iconifiedList.clear(); m_showingDesktop = false; @@ -740,7 +740,7 @@ void KDesktop::slotWindowChanged(WId w, unsigned int dirty) bool KDesktop::showDesktopState() { - return kwinModule()->showingDesktop(); + return twinModule()->showingDesktop(); } void KDesktop::toggleShowDesktop() @@ -836,7 +836,7 @@ void KDesktop::refresh() m_bNeedRepaint |= 1; updateWorkArea(); #endif - kapp->dcopClient()->send( kwin_name, "", "refresh()", TQString("")); + kapp->dcopClient()->send( twin_name, "", "refresh()", TQString("")); refreshIcons(); } @@ -1120,7 +1120,7 @@ void KDesktop::desktopResized() res >> area; } else - area = kwinModule()->workArea(kwinModule()->currentDesktop()); + area = twinModule()->workArea(twinModule()->currentDesktop()); m_pIconView->updateWorkArea(area); m_pIconView->startDirLister(); diff --git a/kdesktop/desktop.h b/kdesktop/desktop.h index 4d3a81750..cad822fc2 100644 --- a/kdesktop/desktop.h +++ b/kdesktop/desktop.h @@ -96,7 +96,7 @@ public: void logout( KApplication::ShutdownConfirm confirm, KApplication::ShutdownType sdtype ); - KWinModule* kwinModule() const { return m_pKwinmodule; } + KWinModule* twinModule() const { return m_pKwinmodule; } // The action collection of the active widget KActionCollection *actionCollection(); @@ -153,7 +153,7 @@ private slots: /** Connected to KDIconView and KRootWidget */ void slotSwitchDesktops(int delta); - // when there seems to be no kicker, we have to get desktopIconsArea from kwinModule + // when there seems to be no kicker, we have to get desktopIconsArea from twinModule void slotNoKicker(); /** Used for desktop show/hide functionality */ diff --git a/kdesktop/init/Templates/linkURL.desktop b/kdesktop/init/Templates/linkURL.desktop index df71e95c2..1af2d73bb 100644 --- a/kdesktop/init/Templates/linkURL.desktop +++ b/kdesktop/init/Templates/linkURL.desktop @@ -144,7 +144,7 @@ Comment[uz@cyrillic]=Мавзуга боғни (URL) киритинг: Comment[ven]=Dzhenisani vhukwamani kha fhethu (URL): Comment[vi]=Nhập liên kết tới trang mạng: Comment[wa]=Novea loyén viè ene plaece (URL): -Comment[xh]=Ngenisa ikhonkco kwindawo ekuyo (URL): +Comment[xh]=Ngenisa ikhonkco twindawo ekuyo (URL): Comment[zh_CN]=输入到位置(URL)的链接： Comment[zh_TW]=輸入到位置的連結(URL)： Comment[zu]=Ngenisa isixhumanisi esiya endaweni (URL): diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc index 7bfe4844f..edbaa339e 100644 --- a/kdesktop/kdiconview.cc +++ b/kdesktop/kdiconview.cc @@ -43,8 +43,8 @@ #include <kstdaction.h> #include <kstandarddirs.h> #include <kurldrag.h> -#include <kwin.h> -#include <kwinmodule.h> +#include <twin.h> +#include <twinmodule.h> #include <fixx11h.h> diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc index 3805e5c81..0292e0e07 100644 --- a/kdesktop/krootwm.cc +++ b/kdesktop/krootwm.cc @@ -46,8 +46,8 @@ #include <dcopref.h> #include <khelpmenu.h> #include <kdebug.h> -#include <kwindowlistmenu.h> -#include <kwin.h> +#include <twindowlistmenu.h> +#include <twin.h> #include <kmenubar.h> #include <kmessagebox.h> #include <kuser.h> @@ -67,7 +67,7 @@ KRootWm * KRootWm::s_rootWm = 0; -extern TQCString kdesktop_name, kicker_name, kwin_name; +extern TQCString kdesktop_name, kicker_name, twin_name; KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE) { @@ -804,18 +804,18 @@ void KRootWm::slotToggleDesktopMenu() // for the standalone menubar setting kapp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data ); kapp->dcopClient()->send( kicker_name, kicker_name, "configureMenubar()", data ); - kapp->dcopClient()->send( "kwin*", "", "reconfigure()", data ); + kapp->dcopClient()->send( "twin*", "", "reconfigure()", data ); } void KRootWm::slotUnclutterWindows() { - kapp->dcopClient()->send(kwin_name, "KWinInterface", "unclutterDesktop()", TQString("")); + kapp->dcopClient()->send(twin_name, "KWinInterface", "unclutterDesktop()", TQString("")); } void KRootWm::slotCascadeWindows() { - kapp->dcopClient()->send(kwin_name, "KWinInterface", "cascadeDesktop()", TQString("")); + kapp->dcopClient()->send(twin_name, "KWinInterface", "cascadeDesktop()", TQString("")); } diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 4552d082b..0a45bbb76 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -42,8 +42,8 @@ #include <kstdguiitem.h> #include <kpixmapeffect.h> #include <kpixmap.h> -#include <kwin.h> -#include <kwinmodule.h> +#include <twin.h> +#include <twinmodule.h> #include <kdialog.h> #include <tqframe.h> diff --git a/kdesktop/main.cc b/kdesktop/main.cc index 695392165..9e5dea4ae 100644 --- a/kdesktop/main.cc +++ b/kdesktop/main.cc @@ -76,7 +76,7 @@ KDesktopApp *myApp = NULL; // ----------------------------------------------------------------------------- int kdesktop_screen_number = 0; -TQCString kdesktop_name, kicker_name, kwin_name; +TQCString kdesktop_name, kicker_name, twin_name; static void crashHandler(int sigId) { @@ -161,11 +161,11 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) if (kdesktop_screen_number == 0) { kdesktop_name = "kdesktop"; kicker_name = "kicker"; - kwin_name = "kwin"; + twin_name = "twin"; } else { kdesktop_name.sprintf("kdesktop-screen-%d", kdesktop_screen_number); kicker_name.sprintf("kicker-screen-%d", kdesktop_screen_number); - kwin_name.sprintf("kwin-screen-%d", kdesktop_screen_number); + twin_name.sprintf("twin-screen-%d", kdesktop_screen_number); } KAboutData aboutData( kdesktop_name, I18N_NOOP("KDesktop"), diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp index 542c2b7e7..51a8959ce 100644 --- a/kdesktop/minicli.cpp +++ b/kdesktop/minicli.cpp @@ -57,7 +57,7 @@ #include <kdebug.h> #include <kpassdlg.h> #include <krun.h> -#include <kwin.h> +#include <twin.h> #include <tdesu/su.h> #include <kstandarddirs.h> #include <kconfig.h> diff --git a/kdm/config.def b/kdm/config.def index 43e7f5971..06a2fe20e 100644 --- a/kdm/config.def +++ b/kdm/config.def @@ -1998,13 +1998,13 @@ Description: Key: WindowManager Type: string -Default: "kwin" +Default: "twin" User: greeter Instance: #*/"" Comment: Window manager binary name, if window decorations are desired. "" means no window manager support. Description: - Specify the Xorg window manager. Currently only kwin is supported. + Specify the Xorg window manager. Currently only twin is supported. Key: UseSAK Type: bool diff --git a/kdm/kfrontend/kdmshutdown.cpp b/kdm/kfrontend/kdmshutdown.cpp index ecd8d5ee8..70fee982e 100644 --- a/kdm/kfrontend/kdmshutdown.cpp +++ b/kdm/kfrontend/kdmshutdown.cpp @@ -57,7 +57,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <stdlib.h> -extern bool has_kwin; +extern bool has_twin; int KDMShutdownBase::curPlugin = -1; PluginList KDMShutdownBase::pluginList; @@ -480,7 +480,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent ) if(doUbuntuLogout) { TQVBoxLayout* vbox = new TQVBoxLayout( this ); - if (has_kwin) + if (has_twin) lfrm->setFrameStyle( TQFrame::NoFrame ); else lfrm->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised ); @@ -548,7 +548,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent ) else { TQHBoxLayout *hbox = new TQHBoxLayout( this, KDmh, KDsh ); - if (has_kwin) + if (has_twin) lfrm->setFrameStyle( TQFrame::NoFrame ); else lfrm->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); diff --git a/kdm/kfrontend/kfdialog.cpp b/kdm/kfrontend/kfdialog.cpp index b834ca450..285c3878e 100644 --- a/kdm/kfrontend/kfdialog.cpp +++ b/kdm/kfrontend/kfdialog.cpp @@ -38,11 +38,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <X11/Xlib.h> #include <X11/Xatom.h> -extern bool has_kwin; +extern bool has_twin; extern bool is_themed; FDialog::FDialog( TQWidget *parent, bool framed ) - : inherited( parent, 0, true, (framed&&has_kwin)?0:WX11BypassWM ), winFrame(NULL), m_wmTitle(has_kwin) + : inherited( parent, 0, true, (framed&&has_twin)?0:WX11BypassWM ), winFrame(NULL), m_wmTitle(has_twin) { if (framed) { // Signal that we do not want any window controls to be shown at all diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp index b9038f698..f21741805 100644 --- a/kdm/kfrontend/kgapp.cpp +++ b/kdm/kfrontend/kgapp.cpp @@ -66,7 +66,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include <pwd.h> bool argb_visual_available = false; -bool has_kwin = false; +bool has_twin = false; bool is_themed = false; bool trinity_desktop_lock_use_sak = TRUE; @@ -190,7 +190,7 @@ kg_main( const char *argv0 ) KProcess *tsak = 0; KProcess *proc = 0; KProcess *comp = 0; - KProcess *kwin = 0; + KProcess *twin = 0; trinity_desktop_lock_use_sak = _useSAK; if (trinity_desktop_lock_use_sak) { @@ -310,10 +310,10 @@ kg_main( const char *argv0 ) } if (!_windowManager.isEmpty()) { - kwin = new KProcess; - *kwin << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + _windowManager.ascii(); - kwin->start(); - has_kwin = true; + twin = new KProcess; + *twin << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + _windowManager.ascii(); + twin->start(); + has_twin = true; } GSendInt( G_Ready ); @@ -361,14 +361,14 @@ kg_main( const char *argv0 ) // This also prevents the user from being dropped to a console login if Xorg glitches or is buggy XSetErrorHandler( ignoreXError ); KThemedGreeter *tgrt; - bool has_kwin_bkp = has_kwin; + bool has_twin_bkp = has_twin; is_themed = true; - has_kwin = false; // [FIXME] The themed greeter is built on the assumption that there is no window manager available (i.e. it keeps stealing focus) and needs to be repaired. + has_twin = false; // [FIXME] The themed greeter is built on the assumption that there is no window manager available (i.e. it keeps stealing focus) and needs to be repaired. dialog = tgrt = new KThemedGreeter; kdDebug() << timestamp() << " themed" << endl; if (!tgrt->isOK()) { is_themed = false; - has_kwin = has_kwin_bkp; + has_twin = has_twin_bkp; delete tgrt; checkSAK(app); dialog = new KStdGreeter; @@ -450,10 +450,10 @@ kg_main( const char *argv0 ) comp->detach(); delete comp; } - if (kwin) { - kwin->closeStdin(); - kwin->detach(); - delete kwin; + if (twin) { + twin->closeStdin(); + twin->detach(); + delete twin; } delete proc; UnsecureDisplay( dpy ); diff --git a/khotkeys/shared/triggers.cpp b/khotkeys/shared/triggers.cpp index 7cac2b98c..cf9b99c6c 100644 --- a/khotkeys/shared/triggers.cpp +++ b/khotkeys/shared/triggers.cpp @@ -19,7 +19,7 @@ #include <kglobalaccel.h> #include <kconfig.h> #include <kdebug.h> -#include <kwinmodule.h> +#include <twinmodule.h> #include <klocale.h> #include <netwm_def.h> #include <kaccel.h> diff --git a/khotkeys/shared/windows.cpp b/khotkeys/shared/windows.cpp index b8e86f694..bd77ba446 100644 --- a/khotkeys/shared/windows.cpp +++ b/khotkeys/shared/windows.cpp @@ -21,8 +21,8 @@ #include <kconfig.h> #include <kdebug.h> -#include <kwinmodule.h> -#include <kwin.h> +#include <twinmodule.h> +#include <twin.h> #include <klocale.h> #include "khotkeysglobal.h" @@ -39,15 +39,15 @@ namespace KHotKeys Windows::Windows( bool enable_signal_P, TQObject* parent_P ) : TQObject( parent_P ), signals_enabled( enable_signal_P ), - kwin_module( new KWinModule( this )), _action_window( 0 ) + twin_module( new KWinModule( this )), _action_window( 0 ) { assert( windows_handler == NULL ); windows_handler = this; if( signals_enabled ) { - connect( kwin_module, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( window_added_slot( WId ))); - connect( kwin_module, TQT_SIGNAL( windowRemoved( WId )), TQT_SLOT( window_removed_slot( WId ))); - connect( kwin_module, TQT_SIGNAL( activeWindowChanged( WId )), + connect( twin_module, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( window_added_slot( WId ))); + connect( twin_module, TQT_SIGNAL( windowRemoved( WId )), TQT_SLOT( window_removed_slot( WId ))); + connect( twin_module, TQT_SIGNAL( activeWindowChanged( WId )), TQT_SLOT( active_window_changed_slot( WId ))); } } @@ -112,7 +112,7 @@ TQString Windows::get_window_class( WId id_P ) WId Windows::active_window() { - return kwin_module->activeWindow(); + return twin_module->activeWindow(); } WId Windows::action_window() @@ -127,8 +127,8 @@ void Windows::set_action_window( WId window_P ) WId Windows::find_window( const Windowdef_list* window_P ) { - for( TQValueList< WId >::ConstIterator it = kwin_module->windows().begin(); - it != kwin_module->windows().end(); + for( TQValueList< WId >::ConstIterator it = twin_module->windows().begin(); + it != twin_module->windows().end(); ++it ) { Window_data tmp( *it ); @@ -185,13 +185,13 @@ void Windows::activate_window( WId id_P ) Window_data::Window_data( WId id_P ) : type( NET::Unknown ) { - KWin::WindowInfo kwin_info = KWin::windowInfo( id_P, NET::WMName | NET::WMWindowType ); // TODO optimize - if( kwin_info.valid()) + KWin::WindowInfo twin_info = KWin::windowInfo( id_P, NET::WMName | NET::WMWindowType ); // TODO optimize + if( twin_info.valid()) { - title = kwin_info.name(); + title = twin_info.name(); role = windows_handler->get_window_role( id_P ); wclass = windows_handler->get_window_class( id_P ); - type = kwin_info.windowType( SUPPORTED_WINDOW_TYPES_MASK ); + type = twin_info.windowType( SUPPORTED_WINDOW_TYPES_MASK ); if( type == NET::Override ) // HACK consider non-NETWM fullscreens to be normal too type = NET::Normal; if( type == NET::Unknown ) diff --git a/khotkeys/shared/windows.h b/khotkeys/shared/windows.h index 8aad308c9..5c491acbf 100644 --- a/khotkeys/shared/windows.h +++ b/khotkeys/shared/windows.h @@ -63,7 +63,7 @@ class KDE_EXPORT Windows void window_changed_slot( WId window_P, unsigned int flags_P ); private: bool signals_enabled; - KWinModule* kwin_module; + KWinModule* twin_module; WId _action_window; }; diff --git a/kicker/applets/clock/datepicker.cpp b/kicker/applets/clock/datepicker.cpp index 3f5d5b4ed..7823df539 100644 --- a/kicker/applets/clock/datepicker.cpp +++ b/kicker/applets/clock/datepicker.cpp @@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdatepicker.h> #include <kiconloader.h> #include <klocale.h> -#include <kwin.h> +#include <twin.h> #include <netwm.h> DatePicker::DatePicker(TQWidget *parent, const TQDate& date, Prefs* _prefs) diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp index f0c05d83c..f0a86946f 100644 --- a/kicker/applets/menu/menuapplet.cpp +++ b/kicker/applets/menu/menuapplet.cpp @@ -35,8 +35,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdebug.h> #include <kglobal.h> #include <klocale.h> -#include <kwin.h> -#include <kwinmodule.h> +#include <twin.h> +#include <twinmodule.h> #include <netwm.h> diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp index 6975af0c0..a684aa6f8 100644 --- a/kicker/applets/minipager/pagerapplet.cpp +++ b/kicker/applets/minipager/pagerapplet.cpp @@ -30,8 +30,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <dcopref.h> #include <kglobalsettings.h> -#include <kwin.h> -#include <kwinmodule.h> +#include <twin.h> +#include <twinmodule.h> #include <kapplication.h> #include <kglobal.h> #include <klocale.h> @@ -114,11 +114,11 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions, setFont( KGlobalSettings::taskbarFont() ); - m_kwin = new KWinModule(TQT_TQOBJECT(this)); - m_activeWindow = m_kwin->activeWindow(); - m_curDesk = m_kwin->currentDesktop(); + m_twin = new KWinModule(TQT_TQOBJECT(this)); + m_activeWindow = m_twin->activeWindow(); + m_curDesk = m_twin->currentDesktop(); - if (m_curDesk == 0) // kwin not yet launched + if (m_curDesk == 0) // twin not yet launched { m_curDesk = 1; } @@ -127,20 +127,20 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions, desktopLayoutX = -1; desktopLayoutY = -1; - TQSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop())); + TQSize s(m_twin->numberOfViewports(m_twin->currentDesktop())); m_useViewports = s.width() * s.height() > 1; drawButtons(); - connect( m_kwin, TQT_SIGNAL( currentDesktopChanged(int)), TQT_SLOT( slotSetDesktop(int) ) ); - connect( m_kwin, TQT_SIGNAL( currentDesktopViewportChanged(int, const TQPoint&)), TQT_SLOT(slotSetDesktopViewport(int, const TQPoint&))); - connect( m_kwin, TQT_SIGNAL( numberOfDesktopsChanged(int)), TQT_SLOT( slotSetDesktopCount(int) ) ); - connect( m_kwin, TQT_SIGNAL( desktopGeometryChanged(int)), TQT_SLOT( slotRefreshViewportCount(int) ) ); - connect( m_kwin, TQT_SIGNAL( activeWindowChanged(WId)), TQT_SLOT( slotActiveWindowChanged(WId) ) ); - connect( m_kwin, TQT_SIGNAL( windowAdded(WId) ), this, TQT_SLOT( slotWindowAdded(WId) ) ); - connect( m_kwin, TQT_SIGNAL( windowRemoved(WId) ), this, TQT_SLOT( slotWindowRemoved(WId) ) ); - connect( m_kwin, TQT_SIGNAL( windowChanged(WId,unsigned int) ), this, TQT_SLOT( slotWindowChanged(WId,unsigned int) ) ); - connect( m_kwin, TQT_SIGNAL( desktopNamesChanged() ), this, TQT_SLOT( slotDesktopNamesChanged() ) ); + connect( m_twin, TQT_SIGNAL( currentDesktopChanged(int)), TQT_SLOT( slotSetDesktop(int) ) ); + connect( m_twin, TQT_SIGNAL( currentDesktopViewportChanged(int, const TQPoint&)), TQT_SLOT(slotSetDesktopViewport(int, const TQPoint&))); + connect( m_twin, TQT_SIGNAL( numberOfDesktopsChanged(int)), TQT_SLOT( slotSetDesktopCount(int) ) ); + connect( m_twin, TQT_SIGNAL( desktopGeometryChanged(int)), TQT_SLOT( slotRefreshViewportCount(int) ) ); + connect( m_twin, TQT_SIGNAL( activeWindowChanged(WId)), TQT_SLOT( slotActiveWindowChanged(WId) ) ); + connect( m_twin, TQT_SIGNAL( windowAdded(WId) ), this, TQT_SLOT( slotWindowAdded(WId) ) ); + connect( m_twin, TQT_SIGNAL( windowRemoved(WId) ), this, TQT_SLOT( slotWindowRemoved(WId) ) ); + connect( m_twin, TQT_SIGNAL( windowChanged(WId,unsigned int) ), this, TQT_SLOT( slotWindowChanged(WId,unsigned int) ) ); + connect( m_twin, TQT_SIGNAL( desktopNamesChanged() ), this, TQT_SLOT( slotDesktopNamesChanged() ) ); connect( kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)) ); if (kapp->authorizeKAction("kicker_rmb") && kapp->authorizeControlModule("kde-kcmtaskbar.desktop")) @@ -152,8 +152,8 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions, } TQValueList<WId>::ConstIterator it; - TQValueList<WId>::ConstIterator itEnd = m_kwin->windows().end(); - for ( it = m_kwin->windows().begin(); it != itEnd; ++it) + TQValueList<WId>::ConstIterator itEnd = m_twin->windows().end(); + for ( it = m_twin->windows().begin(); it != itEnd; ++it) { slotWindowAdded( (*it) ); } @@ -172,7 +172,7 @@ KMiniPager::~KMiniPager() void KMiniPager::slotBackgroundChanged(int desk) { - unsigned numDesktops = m_kwin->numberOfDesktops(); + unsigned numDesktops = m_twin->numberOfDesktops(); if (numDesktops != m_desktops.count()) { slotSetDesktopCount(numDesktops); @@ -189,9 +189,9 @@ void KMiniPager::slotBackgroundChanged(int desk) void KMiniPager::slotSetDesktop(int desktop) { - if (m_kwin->numberOfDesktops() > static_cast<int>(m_desktops.count())) + if (m_twin->numberOfDesktops() > static_cast<int>(m_desktops.count())) { - slotSetDesktopCount( m_kwin->numberOfDesktops() ); + slotSetDesktopCount( m_twin->numberOfDesktops() ); } if (!m_useViewports && (desktop != KWin::currentDesktop())) @@ -200,8 +200,8 @@ void KMiniPager::slotSetDesktop(int desktop) // holds down the key combo to switch desktops, lets the // mouse go but keeps the key combo held. the desktop will switch // back to the desktop associated with the key combo and then it - // becomes a race condition between kwin's signal and the button's - // signal. usually kwin wins. + // becomes a race condition between twin's signal and the button's + // signal. usually twin wins. return; } @@ -222,21 +222,21 @@ void KMiniPager::slotSetDesktopViewport(int desktop, const TQPoint& viewport) { // ### Q_UNUSED(desktop); - TQSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop())); + TQSize s(m_twin->numberOfViewports(m_twin->currentDesktop())); slotSetDesktop((viewport.y()-1) * s.width() + viewport.x() ); } void KMiniPager::slotButtonSelected( int desk ) { - if (m_kwin->numberOfViewports(m_kwin->currentDesktop()).width() * - m_kwin->numberOfViewports(m_kwin->currentDesktop()).height() > 1) + if (m_twin->numberOfViewports(m_twin->currentDesktop()).width() * + m_twin->numberOfViewports(m_twin->currentDesktop()).height() > 1) { TQPoint p; p.setX( (desk-1) * TQApplication::desktop()->width()); p.setY( 0 ); - KWin::setCurrentDesktopViewport(m_kwin->currentDesktop(), p); + KWin::setCurrentDesktopViewport(m_twin->currentDesktop(), p); } else KWin::setCurrentDesktop( desk ); @@ -251,8 +251,8 @@ int KMiniPager::widthForHeight(int h) const return width(); } - int deskNum = m_kwin->numberOfDesktops() * m_kwin->numberOfViewports(0).width() - * m_kwin->numberOfViewports(0).height(); + int deskNum = m_twin->numberOfDesktops() * m_twin->numberOfViewports(0).width() + * m_twin->numberOfViewports(0).height(); int rowNum = m_settings->numberOfRows(); if (rowNum == 0) @@ -286,7 +286,7 @@ int KMiniPager::widthForHeight(int h) const TQFontMetrics fm = fontMetrics(); for (int i = 1; i <= deskNum; i++) { - int sw = fm.width( m_kwin->desktopName( i ) ) + 8; + int sw = fm.width( m_twin->desktopName( i ) ) + 8; if (sw > bw) { bw = sw; @@ -307,8 +307,8 @@ int KMiniPager::heightForWidth(int w) const return height(); } - int deskNum = m_kwin->numberOfDesktops() * m_kwin->numberOfViewports(0).width() - * m_kwin->numberOfViewports(0).height(); + int deskNum = m_twin->numberOfDesktops() * m_twin->numberOfViewports(0).width() + * m_twin->numberOfViewports(0).height(); int rowNum = m_settings->numberOfRows(); // actually these are columns now... oh well. if (rowNum == 0) { @@ -442,8 +442,8 @@ void KMiniPager::wheelEvent( TQWheelEvent* e ) { int newDesk; int desktops = KWin::numberOfDesktops(); - if (m_kwin->numberOfViewports(0).width() * m_kwin->numberOfViewports(0).height() > 1 ) - desktops = m_kwin->numberOfViewports(0).width() * m_kwin->numberOfViewports(0).height(); + if (m_twin->numberOfViewports(0).width() * m_twin->numberOfViewports(0).height() > 1 ) + desktops = m_twin->numberOfViewports(0).width() * m_twin->numberOfViewports(0).height(); if (e->delta() < 0) { newDesk = m_curDesk % desktops + 1; @@ -458,17 +458,17 @@ void KMiniPager::wheelEvent( TQWheelEvent* e ) void KMiniPager::drawButtons() { - int deskNum = m_kwin->numberOfDesktops(); + int deskNum = m_twin->numberOfDesktops(); KMiniPagerButton *desk; int count = 1; int i = 1; do { - TQSize viewportNum = m_kwin->numberOfViewports(i); + TQSize viewportNum = m_twin->numberOfViewports(i); for (int j = 1; j <= viewportNum.width() * viewportNum.height(); ++j) { - TQSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop())); + TQSize s(m_twin->numberOfViewports(m_twin->currentDesktop())); TQPoint viewport( (j-1) % s.width(), (j-1) / s.width()); desk = new KMiniPagerButton( count, m_useViewports, viewport, this ); if ( m_settings->labelType() != PagerSettings::EnumLabelType::LabelName ) @@ -493,7 +493,7 @@ void KMiniPager::drawButtons() void KMiniPager::slotSetDesktopCount( int ) { - TQSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop())); + TQSize s(m_twin->numberOfViewports(m_twin->currentDesktop())); m_useViewports = s.width() * s.height() > 1; TQValueList<KMiniPagerButton*>::ConstIterator it; @@ -506,7 +506,7 @@ void KMiniPager::slotSetDesktopCount( int ) drawButtons(); - m_curDesk = m_kwin->currentDesktop(); + m_curDesk = m_twin->currentDesktop(); if ( m_curDesk == 0 ) { m_curDesk = 1; @@ -518,7 +518,7 @@ void KMiniPager::slotSetDesktopCount( int ) void KMiniPager::slotRefreshViewportCount( int ) { - TQSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop())); + TQSize s(m_twin->numberOfViewports(m_twin->currentDesktop())); m_useViewports = s.width() * s.height() > 1; TQValueList<KMiniPagerButton*>::ConstIterator it; @@ -531,7 +531,7 @@ void KMiniPager::slotRefreshViewportCount( int ) drawButtons(); - m_curDesk = m_kwin->currentDesktop(); + m_curDesk = m_twin->currentDesktop(); if ( m_curDesk == 0 ) { m_curDesk = 1; @@ -709,7 +709,7 @@ void KMiniPager::aboutToShowContextMenu() m_contextMenu->insertSeparator(); m_contextMenu->insertItem(i18n("&Rename Desktop \"%1\"") - .arg(kwin()->desktopName(m_rmbDesk)), RenameDesktop); + .arg(twin()->desktopName(m_rmbDesk)), RenameDesktop); m_contextMenu->insertSeparator(); KPopupMenu* showMenu = new KPopupMenu(m_contextMenu); @@ -863,7 +863,7 @@ void KMiniPager::slotDesktopNamesChanged() for (int i = 1; it != itEnd; ++it, ++i) { - TQString name = m_kwin->desktopName(i); + TQString name = m_twin->desktopName(i); (*it)->setDesktopName(name); (*it)->tqrepaint(); TQToolTip::remove((*it)); diff --git a/kicker/applets/minipager/pagerapplet.h b/kicker/applets/minipager/pagerapplet.h index e72f44588..02f72198e 100644 --- a/kicker/applets/minipager/pagerapplet.h +++ b/kicker/applets/minipager/pagerapplet.h @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqintdict.h> #include <kpanelapplet.h> -#include <kwin.h> +#include <twin.h> #include "pagerbutton.h" #include "pagersettings.h" @@ -58,7 +58,7 @@ public: int heightForWidth(int width) const; KWin::WindowInfo* info( WId win ); - KWinModule* kwin() { return m_kwin; } + KWinModule* twin() { return m_twin; } KTextShadowEngine* shadowEngine(); void setActive( WId active ) { m_activeWindow = active; } @@ -128,7 +128,7 @@ private: int desktopLayoutY; KSelectionOwner* m_desktopLayoutOwner; - KWinModule *m_kwin; + KWinModule *m_twin; KTextShadowEngine* m_shadowEngine; TQPopupMenu *m_contextMenu; diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp index d6047d407..e494d538d 100644 --- a/kicker/applets/minipager/pagerbutton.cpp +++ b/kicker/applets/minipager/pagerbutton.cpp @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <netwm.h> #include <dcopclient.h> -#include <kwinmodule.h> +#include <twinmodule.h> #include <ksharedpixmap.h> #include <kpixmapio.h> #include <kpixmapeffect.h> @@ -81,7 +81,7 @@ KMiniPagerButton::KMiniPagerButton(int desk, bool useViewPorts, const TQPoint& v setBackgroundOrigin(AncestorOrigin); installEventFilter(KickerTip::the()); - m_desktopName = m_pager->kwin()->desktopName(m_desktop); + m_desktopName = m_pager->twin()->desktopName(m_desktop); connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked())); connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool))); @@ -108,7 +108,7 @@ TQRect KMiniPagerButton::mapGeometryToViewport(const KWin::WindowInfo& info) con // ### fix vertically layouted viewports TQRect _r(info.frameGeometry()); - TQPoint vx(m_pager->kwin()->currentViewport(m_pager->kwin()->currentDesktop())); + TQPoint vx(m_pager->twin()->currentViewport(m_pager->twin()->currentDesktop())); _r.moveBy( - (m_desktop - vx.x()) * TQApplication::desktop()->width(), 0); @@ -127,7 +127,7 @@ TQPoint KMiniPagerButton::mapPointToViewport(const TQPoint& _p) const { if (!m_useViewports) return _p; - TQPoint vx(m_pager->kwin()->currentViewport(m_pager->kwin()->currentDesktop())); + TQPoint vx(m_pager->twin()->currentViewport(m_pager->twin()->currentDesktop())); // ### fix vertically layouted viewports TQPoint p(_p); @@ -443,12 +443,12 @@ void KMiniPagerButton::drawButton(TQPainter *bp) // window preview... if (m_pager->desktopPreview()) { - KWinModule* kwin = m_pager->kwin(); + KWinModule* twin = m_pager->twin(); KWin::WindowInfo *info = 0; int dw = TQApplication::desktop()->width(); int dh = TQApplication::desktop()->height(); - TQValueList<WId> windows = kwin->stackingOrder(); + TQValueList<WId> windows = twin->stackingOrder(); TQValueList<WId>::const_iterator itEnd = windows.constEnd(); for (TQValueList<WId>::ConstIterator it = windows.constBegin(); it != itEnd; ++it) { @@ -460,7 +460,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp) r = TQRect(r.x() * width() / dw, 2 + r.y() * height() / dh, r.width() * width() / dw, r.height() * height() / dh); - if (kwin->activeWindow() == info->win()) + if (twin->activeWindow() == info->win()) { TQBrush brush = tqcolorGroup().brush(TQColorGroup::Highlight); qDrawShadeRect(bp, r, tqcolorGroup(), false, 1, 0, &brush); @@ -704,7 +704,7 @@ void KMiniPagerButton::dragLeaveEvent( TQDragLeaveEvent* e ) { m_dragSwitchTimer.stop(); - if (m_pager->kwin()->currentDesktop() != m_desktop) + if (m_pager->twin()->currentDesktop() != m_desktop) { setDown(false); } @@ -750,7 +750,7 @@ bool KMiniPagerButton::eventFilter( TQObject *o, TQEvent * e) if (o && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_lineEdit) && (e->type() == TQEvent::FocusOut || e->type() == TQEvent::Hide)) { - m_pager->kwin()->setDesktopName( m_desktop, m_lineEdit->text() ); + m_pager->twin()->setDesktopName( m_desktop, m_lineEdit->text() ); m_desktopName = m_lineEdit->text(); TQTimer::singleShot( 0, m_lineEdit, TQT_SLOT( deleteLater() ) ); m_lineEdit = 0; diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp index 7112c706a..03be831e3 100644 --- a/kicker/applets/swallow/swallow.cpp +++ b/kicker/applets/swallow/swallow.cpp @@ -31,8 +31,8 @@ #include <kmessagebox.h> #include <kprocess.h> #include <kshell.h> -#include <kwin.h> -#include <kwinmodule.h> +#include <twin.h> +#include <twinmodule.h> #include <X11/Xlib.h> #include <X11/Xutil.h> diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 619fdebcc..570db2f92 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -42,11 +42,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kdebug.h> #include <kglobal.h> #include <krun.h> -#include <kwinmodule.h> +#include <twinmodule.h> #include <kdialogbase.h> #include <kactionselector.h> #include <kiconloader.h> -#include <kwin.h> +#include <twin.h> #include "kickerSettings.h" @@ -102,7 +102,7 @@ SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int ac setBackgroundOrigin(AncestorOrigin); - kwin_module = new KWinModule(TQT_TQOBJECT(this)); + twin_module = new KWinModule(TQT_TQOBJECT(this)); // kApplication notifies us of settings changes. added to support // disabling of frame effect on mouse hover @@ -121,7 +121,7 @@ void SystemTrayApplet::updateClockGeometry() void SystemTrayApplet::initialize() { // register existing tray windows - const TQValueList<WId> systemTrayWindows = kwin_module->systemTrayWindows(); + const TQValueList<WId> systemTrayWindows = twin_module->systemTrayWindows(); bool existing = false; for (TQValueList<WId>::ConstIterator it = systemTrayWindows.begin(); it != systemTrayWindows.end(); ++it ) @@ -139,9 +139,9 @@ void SystemTrayApplet::initialize() } // the KWinModule notifies us when tray windows are added or removed - connect( kwin_module, TQT_SIGNAL( systemTrayWindowAdded(WId) ), + connect( twin_module, TQT_SIGNAL( systemTrayWindowAdded(WId) ), this, TQT_SLOT( systemTrayWindowAdded(WId) ) ); - connect( kwin_module, TQT_SIGNAL( systemTrayWindowRemoved(WId) ), + connect( twin_module, TQT_SIGNAL( systemTrayWindowRemoved(WId) ), this, TQT_SLOT( updateTrayWindows() ) ); TQCString screenstr; @@ -711,7 +711,7 @@ void SystemTrayApplet::updateTrayWindows() WId wid = (*emb)->embeddedWinId(); if ((wid == 0) || ((*emb)->kdeTray() && - !kwin_module->systemTrayWindows().contains(wid))) + !twin_module->systemTrayWindows().contains(wid))) { (*emb)->deleteLater(); emb = m_shownWins.erase(emb); @@ -728,7 +728,7 @@ void SystemTrayApplet::updateTrayWindows() WId wid = (*emb)->embeddedWinId(); if ((wid == 0) || ((*emb)->kdeTray() && - !kwin_module->systemTrayWindows().contains(wid))) + !twin_module->systemTrayWindows().contains(wid))) { (*emb)->deleteLater(); emb = m_hiddenWins.erase(emb); diff --git a/kicker/applets/systemtray/systemtrayapplet.h b/kicker/applets/systemtray/systemtrayapplet.h index 868941c13..92aab7268 100644 --- a/kicker/applets/systemtray/systemtrayapplet.h +++ b/kicker/applets/systemtray/systemtrayapplet.h @@ -104,7 +104,7 @@ private: TrayEmbedList m_hiddenWins; TQStringList m_hiddenIconList; TQStringList m_sortOrderIconList; - KWinModule *kwin_module; + KWinModule *twin_module; Atom net_system_tray_selection; Atom net_system_tray_opcode; bool m_showFrame; diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index aee6a728c..da20a2a61 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/kicker/extensions/dockbar/dockbarextension.cpp @@ -23,12 +23,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #undef Bool // For enable-final #include <klocale.h> -#include <kwinmodule.h> +#include <twinmodule.h> #include <kdebug.h> #include <kconfig.h> #include <kprocess.h> #include <kshell.h> -#include <kwin.h> +#include <twin.h> #include <kstandarddirs.h> #include <kmessagebox.h> #include <kapplication.h> @@ -57,8 +57,8 @@ DockBarExtension::DockBarExtension(const TQString& configFile, Type type, : KPanelExtension(configFile, type, actions, parent, name) { dragging_container = 0; - kwin_module = new KWinModule(TQT_TQOBJECT(this)); - connect( kwin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) ); + twin_module = new KWinModule(TQT_TQOBJECT(this)); + connect( twin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) ); setMinimumSize(DockContainer::sz(), DockContainer::sz()); tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); loadContainerConfig(); @@ -154,8 +154,8 @@ void DockBarExtension::windowAdded(WId win) kdDebug() << "Could not read XClassHint of window " << win << endl; return; } - /* withdrawing the window prevents kwin from managing the window, - which causes the double-launch bug (one instance from the kwin + /* withdrawing the window prevents twin from managing the window, + which causes the double-launch bug (one instance from the twin session, and one from the dockbar) bug when kde is restarted */ if (resIconwin != win) { XWithdrawWindow( qt_xdisplay(), win, qt_xscreen() ); diff --git a/kicker/extensions/dockbar/dockbarextension.h b/kicker/extensions/dockbar/dockbarextension.h index eada2583b..4a5dff41f 100644 --- a/kicker/extensions/dockbar/dockbarextension.h +++ b/kicker/extensions/dockbar/dockbarextension.h @@ -61,7 +61,7 @@ protected: void mouseReleaseEvent(TQMouseEvent *); void mouseMoveEvent(TQMouseEvent *); private: - KWinModule* kwin_module; + KWinModule* twin_module; DockContainer::Vector containers; // handle the dragging of applets diff --git a/kicker/extensions/dockbar/dockcontainer.cpp b/kicker/extensions/dockbar/dockcontainer.cpp index 1d281619a..f6ac6bd33 100644 --- a/kicker/extensions/dockbar/dockcontainer.cpp +++ b/kicker/extensions/dockbar/dockcontainer.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqwidget.h> #include <tqtooltip.h> -#include <kwin.h> +#include <twin.h> #include <tqvalidator.h> #include <kinputdialog.h> #include <klocale.h> diff --git a/kicker/extensions/kasbar/ChangeLog b/kicker/extensions/kasbar/ChangeLog index 09408fc4a..67b22fd8a 100644 --- a/kicker/extensions/kasbar/ChangeLog +++ b/kicker/extensions/kasbar/ChangeLog @@ -384,7 +384,7 @@ 2004-06-26 Saturday 00:28 rich - * - Fix test program for kwin changes. + * - Fix test program for twin changes. 2004-06-26 Saturday 00:10 rich @@ -698,7 +698,7 @@ 2001-11-29 Thursday 19:23 rich - * Switch to taskmanager task popup menu instead of kwin (avoids + * Switch to taskmanager task popup menu instead of twin (avoids some problems) 2001-11-25 Sunday 02:03 rich diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp index 17cbfb967..8ceceaf37 100644 --- a/kicker/extensions/kasbar/kasbarapp.cpp +++ b/kicker/extensions/kasbar/kasbarapp.cpp @@ -56,7 +56,7 @@ #include <kconfig.h> #include <kdebug.h> #include <dcopclient.h> -#include <kwin.h> +#include <twin.h> #include <kglobal.h> #include <klocale.h> diff --git a/kicker/extensions/kasbar/kasclockitem.cpp b/kicker/extensions/kasbar/kasclockitem.cpp index 518245d4b..959734c22 100644 --- a/kicker/extensions/kasbar/kasclockitem.cpp +++ b/kicker/extensions/kasbar/kasclockitem.cpp @@ -7,7 +7,7 @@ #include <kdatepicker.h> #include <kglobal.h> -#include <kwin.h> +#include <twin.h> #include <kiconloader.h> #include <kpixmap.h> #include <kpixmapeffect.h> diff --git a/kicker/extensions/kasbar/kasgroupitem.cpp b/kicker/extensions/kasbar/kasgroupitem.cpp index fe5f02ef6..31615acbf 100644 --- a/kicker/extensions/kasbar/kasgroupitem.cpp +++ b/kicker/extensions/kasbar/kasgroupitem.cpp @@ -58,7 +58,7 @@ #include <kdebug.h> #include <kglobal.h> -#include <kwin.h> +#include <twin.h> #include <kiconloader.h> #include <kpixmap.h> #include <kpixmapeffect.h> diff --git a/kicker/extensions/kasbar/kasloaditem.cpp b/kicker/extensions/kasbar/kasloaditem.cpp index e36d2d18d..459bd6639 100644 --- a/kicker/extensions/kasbar/kasloaditem.cpp +++ b/kicker/extensions/kasbar/kasloaditem.cpp @@ -14,7 +14,7 @@ #include <kdebug.h> #include <kglobal.h> -#include <kwin.h> +#include <twin.h> #include <kiconloader.h> #include <kpixmap.h> #include <kpixmapeffect.h> diff --git a/kicker/extensions/kasbar/kasstartupitem.cpp b/kicker/extensions/kasbar/kasstartupitem.cpp index 4d2ac3b00..41adc5249 100644 --- a/kicker/extensions/kasbar/kasstartupitem.cpp +++ b/kicker/extensions/kasbar/kasstartupitem.cpp @@ -58,7 +58,7 @@ #include <kdebug.h> #include <kglobal.h> -#include <kwin.h> +#include <twin.h> #include <kiconloader.h> #include <kpixmap.h> #include <kpixmapeffect.h> diff --git a/kicker/kicker/buttons/windowlistbutton.cpp b/kicker/kicker/buttons/windowlistbutton.cpp index 0b413d880..789911167 100644 --- a/kicker/kicker/buttons/windowlistbutton.cpp +++ b/kicker/kicker/buttons/windowlistbutton.cpp @@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <tqtooltip.h> -#include <kwindowlistmenu.h> +#include <twindowlistmenu.h> #include <klocale.h> #include "windowlistbutton.h" diff --git a/kicker/kicker/core/container_applet.h b/kicker/kicker/core/container_applet.h index 019e52c96..18ce050d5 100644 --- a/kicker/kicker/core/container_applet.h +++ b/kicker/kicker/core/container_applet.h @@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kpanelapplet.h> #include <dcopobject.h> -#include <kwin.h> +#include <twin.h> #include "appletinfo.h" #include "container_base.h" diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 5b30dbad5..51a9904d7 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -44,13 +44,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kglobal.h> #include <kicker.h> #include <kstandarddirs.h> -#include <kwin.h> +#include <twin.h> #include <klocale.h> #include <kglobalsettings.h> #include <kapplication.h> #include <netwm.h> #include <fixx11h.h> -#include <kwinmodule.h> +#include <twinmodule.h> #include "container_base.h" #include "extensionmanager.h" @@ -136,8 +136,8 @@ void ExtensionContainer::init() KWin::setState(winId(), NET::Sticky); KWin::setOnAllDesktops(winId(), true); - connect(Kicker::the()->kwinModule(), TQT_SIGNAL(strutChanged()), this, TQT_SLOT(strutChanged())); - connect(Kicker::the()->kwinModule(), TQT_SIGNAL(currentDesktopChanged(int)), + connect(Kicker::the()->twinModule(), TQT_SIGNAL(strutChanged()), this, TQT_SLOT(strutChanged())); + connect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)), this, TQT_SLOT( currentDesktopChanged(int))); setBackgroundOrigin(AncestorOrigin); diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp index 03e039ee0..d3ec91e2c 100644 --- a/kicker/kicker/core/extensionmanager.cpp +++ b/kicker/kicker/core/extensionmanager.cpp @@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kmenubar.h> #include <kmessagebox.h> #include <kstandarddirs.h> -#include <kwinmodule.h> +#include <twinmodule.h> #include <dcopref.h> #include "container_extension.h" @@ -625,7 +625,7 @@ TQRect ExtensionManager::workArea(int XineramaScreen, const ExtensionContainer* { if (!extension) { - return Kicker::the()->kwinModule()->workArea(XineramaScreen); + return Kicker::the()->twinModule()->workArea(XineramaScreen); } TQValueList<WId> list; @@ -676,11 +676,11 @@ TQRect ExtensionManager::workArea(int XineramaScreen, const ExtensionContainer* if ((XineramaScreen == XineramaAllScreens) || (kapp->desktop()->numScreens() < 2)) { /* special value for all screens */ - workArea = Kicker::the()->kwinModule()->workArea(list); + workArea = Kicker::the()->twinModule()->workArea(list); } else { - workArea = Kicker::the()->kwinModule()->workArea(list, XineramaScreen) + workArea = Kicker::the()->twinModule()->workArea(list, XineramaScreen) .intersect(TQApplication::desktop()->screenGeometry(XineramaScreen)); } diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp index 7ba06c61c..f4d0edc40 100644 --- a/kicker/kicker/core/kicker.cpp +++ b/kicker/kicker/core/kicker.cpp @@ -42,8 +42,8 @@ #include <klocale.h> #include <kmessagebox.h> #include <kstandarddirs.h> -#include <kwin.h> -#include <kwinmodule.h> +#include <twin.h> +#include <twinmodule.h> #include "extensionmanager.h" #include "pluginmanager.h" @@ -64,7 +64,7 @@ Kicker* Kicker::the() { return static_cast<Kicker*>(kapp); } Kicker::Kicker() : KUniqueApplication(), keys(0), - m_kwinModule(0), + m_twinModule(0), m_configDialog(0), m_canAddContainers(true) { @@ -379,14 +379,14 @@ void Kicker::clearQuickStartMenu() MenuManager::the()->kmenu()->clearRecentMenuItems(); } -KWinModule* Kicker::kwinModule() +KWinModule* Kicker::twinModule() { - if (!m_kwinModule) + if (!m_twinModule) { - m_kwinModule = new KWinModule(); + m_twinModule = new KWinModule(); } - return m_kwinModule; + return m_twinModule; } TQRect Kicker::desktopIconsArea(int screen) const diff --git a/kicker/kicker/core/kicker.h b/kicker/kicker/core/kicker.h index 6bb071007..bc00e1915 100644 --- a/kicker/kicker/core/kicker.h +++ b/kicker/kicker/core/kicker.h @@ -69,7 +69,7 @@ k_dcop_signals: public: static Kicker* the(); KDirWatch* fileWatcher(); - KWinModule* kwinModule(); + KWinModule* twinModule(); bool isImmutable() const; bool isKioskImmutable() const; @@ -122,7 +122,7 @@ private: static void crashHandler(int signal); KGlobalAccel* keys; - KWinModule* m_kwinModule; + KWinModule* m_twinModule; KCMultiDialog* m_configDialog; bool m_canAddContainers; TQPoint m_insertionPoint; diff --git a/kicker/kicker/core/showdesktop.cpp b/kicker/kicker/core/showdesktop.cpp index 7f75ba1b9..e41ddb549 100644 --- a/kicker/kicker/core/showdesktop.cpp +++ b/kicker/kicker/core/showdesktop.cpp @@ -26,8 +26,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "kicker.h" #include "kickerSettings.h" -#include <kwin.h> -#include <kwinmodule.h> +#include <twin.h> +#include <twinmodule.h> #include <netwm.h> #include "showdesktop.h" @@ -49,9 +49,9 @@ ShowDesktop::ShowDesktop() m_wmSupport = i.isSupported( NET::WM2ShowingDesktop ); if( m_wmSupport ) { - connect( Kicker::the()->kwinModule(), TQT_SIGNAL( showingDesktopChanged( bool )), + connect( Kicker::the()->twinModule(), TQT_SIGNAL( showingDesktopChanged( bool )), TQT_SLOT( showingDesktopChanged( bool ))); - showingDesktopChanged( m_showingDesktop = Kicker::the()->kwinModule()->showingDesktop()); + showingDesktopChanged( m_showingDesktop = Kicker::the()->twinModule()->showingDesktop()); } } @@ -74,9 +74,9 @@ void ShowDesktop::slotWindowAdded(WId w) if ((windowType == NET::Normal || windowType == NET::Unknown) && inf.mappingState() == NET::Visible) { - KConfig kwincfg( "kwinrc", true ); // see in kwin - kwincfg.setGroup( "Windows" ); - if( kwincfg.readBoolEntry( "ShowDesktopIsMinimizeAll", false )) + KConfig twincfg( "twinrc", true ); // see in twin + twincfg.setGroup( "Windows" ); + if( twincfg.readBoolEntry( "ShowDesktopIsMinimizeAll", false )) { m_iconifiedList.clear(); m_showingDesktop = false; @@ -130,10 +130,10 @@ void ShowDesktop::showDesktop( bool b ) if (b) { - m_activeWindow = Kicker::the()->kwinModule()->activeWindow(); + m_activeWindow = Kicker::the()->twinModule()->activeWindow(); m_iconifiedList.clear(); - const TQValueList<WId> windows = Kicker::the()->kwinModule()->windows(); + const TQValueList<WId> windows = Kicker::the()->twinModule()->windows(); for (TQValueList<WId>::ConstIterator it = windows.begin(); it != windows.end(); ++it) @@ -145,7 +145,7 @@ void ShowDesktop::showDesktop( bool b ) if (info.mappingState() == NET::Visible && (info.desktop() == NETWinInfo::OnAllDesktops || - info.desktop() == (int)Kicker::the()->kwinModule()->currentDesktop())) + info.desktop() == (int)Kicker::the()->twinModule()->currentDesktop())) { m_iconifiedList.append( w ); } @@ -161,20 +161,20 @@ void ShowDesktop::showDesktop( bool b ) } // on desktop changes or when a window is deiconified, we abort the show desktop mode - connect(Kicker::the()->kwinModule(), TQT_SIGNAL(currentDesktopChanged(int)), + connect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(slotCurrentDesktopChanged(int))); - connect(Kicker::the()->kwinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)), + connect(Kicker::the()->twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)), TQT_SLOT(slotWindowChanged(WId,unsigned int))); - connect(Kicker::the()->kwinModule(), TQT_SIGNAL(windowAdded(WId)), + connect(Kicker::the()->twinModule(), TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(slotWindowAdded(WId))); } else { - disconnect(Kicker::the()->kwinModule(), TQT_SIGNAL(currentDesktopChanged(int)), + disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)), this, TQT_SLOT(slotCurrentDesktopChanged(int))); - disconnect(Kicker::the()->kwinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)), + disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(windowChanged(WId,unsigned int)), this, TQT_SLOT(slotWindowChanged(WId,unsigned int))); - disconnect(Kicker::the()->kwinModule(), TQT_SIGNAL(windowAdded(WId)), + disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(windowAdded(WId)), this, TQT_SLOT(slotWindowAdded(WId))); for (TQValueVector<WId>::ConstIterator it = m_iconifiedList.begin(); diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index 36a7bef7d..f9ab06006 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/kicker/kicker/ui/itemview.cpp @@ -59,7 +59,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kmessagebox.h> #include <kstandarddirs.h> #include <kcombobox.h> -#include <kwin.h> +#include <twin.h> #include <kdebug.h> #include <kmimetype.h> #include <kmultipledrag.h> diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index d6d130a02..6953143c9 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/kicker/kicker/ui/k_mnu.cpp @@ -50,7 +50,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kmessagebox.h> #include <kstandarddirs.h> #include <ktoolbarbutton.h> -#include <kwin.h> +#include <twin.h> #include "client_mnu.h" #include "container_base.h" diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index 1a87b163d..e27f47d88 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -58,7 +58,7 @@ #include <kmessagebox.h> #include <kstandarddirs.h> #include <kcombobox.h> -#include <kwin.h> +#include <twin.h> #include <kdebug.h> #include <kuser.h> #include <kurllabel.h> diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index 7b8243777..0f18914f3 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/kicker/proxy/appletproxy.cpp @@ -40,7 +40,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kaboutdata.h> #include <tqfileinfo.h> #include <dcopclient.h> -#include <kwin.h> +#include <twin.h> #include "appletinfo.h" diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp index bfd1a40bf..404c27e24 100644 --- a/kicker/taskbar/taskbarcontainer.cpp +++ b/kicker/taskbar/taskbarcontainer.cpp @@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kapplication.h> #include <kdebug.h> #include <kiconloader.h> -#include <kwindowlistmenu.h> +#include <twindowlistmenu.h> #include <X11/X.h> #include <X11/Xlib.h> diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index 037f65b68..7c850e853 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -1140,7 +1140,7 @@ void TaskContainer::popupMenu(int action) } else if (action == TaskBarSettings::ShowOperationsMenu) { - if (!kapp->authorizeKAction("kwin_rmb")) + if (!kapp->authorizeKAction("twin_rmb")) { return; } diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp index 3b2316e4d..f6cff4248 100644 --- a/kicker/taskmanager/taskmanager.cpp +++ b/kicker/taskmanager/taskmanager.cpp @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <klocale.h> // #include <kpixmapio.h> #include <kstaticdeleter.h> -#include <kwinmodule.h> +#include <twinmodule.h> #include <kxerrorhandler.h> #include <netwm.h> diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h index ddd5327d2..febb923e2 100644 --- a/kicker/taskmanager/taskmanager.h +++ b/kicker/taskmanager/taskmanager.h @@ -39,7 +39,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <ksharedptr.h> #include <kstartupinfo.h> -#include <kwin.h> +#include <twin.h> #include <config.h> diff --git a/klipper/configdialog.cpp b/klipper/configdialog.cpp index 92006e583..ea1fb0974 100644 --- a/klipper/configdialog.cpp +++ b/klipper/configdialog.cpp @@ -29,7 +29,7 @@ #include <kiconloader.h> #include <klocale.h> #include <kpopupmenu.h> -#include <kwinmodule.h> +#include <twinmodule.h> #include <kregexpeditorinterface.h> #include <kparts/componentfactory.h> diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp index a064fe87f..3e2f9de72 100644 --- a/klipper/klipperpopup.cpp +++ b/klipper/klipperpopup.cpp @@ -27,7 +27,7 @@ #include <klocale.h> #include <kaction.h> #include <kglobalsettings.h> -#include <kwin.h> +#include <twin.h> #include <kapplication.h> #include <kglobalsettings.h> #include <kdebug.h> diff --git a/klipper/main.cpp b/klipper/main.cpp index cb54a0e68..2f87c7043 100644 --- a/klipper/main.cpp +++ b/klipper/main.cpp @@ -23,7 +23,7 @@ #include <klocale.h> #include <kcmdlineargs.h> -#include <kwin.h> +#include <twin.h> #include <kaboutdata.h> #include <kuniqueapplication.h> diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp index 059471e0b..0db99c25e 100644 --- a/klipper/toplevel.cpp +++ b/klipper/toplevel.cpp @@ -46,7 +46,7 @@ #include <kstringhandler.h> #include <ksystemtray.h> #include <kurldrag.h> -#include <kwin.h> +#include <twin.h> #include <kdebug.h> #include <kglobalsettings.h> #include <dcopclient.h> diff --git a/konqueror/KonqMainWindowIface.cc b/konqueror/KonqMainWindowIface.cc index 0b3d05ed6..4f0598626 100644 --- a/konqueror/KonqMainWindowIface.cc +++ b/konqueror/KonqMainWindowIface.cc @@ -29,7 +29,7 @@ #include <kdcoppropertyproxy.h> #include <kdebug.h> #include <kstartupinfo.h> -#include <kwin.h> +#include <twin.h> KonqMainWindowIface::KonqMainWindowIface( KonqMainWindow * mainWindow ) : diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc index 1569b0dbc..fdc95b961 100644 --- a/konqueror/client/kfmclient.cc +++ b/konqueror/client/kfmclient.cc @@ -44,7 +44,7 @@ #include "kfmclient.h" #include "KonquerorIface_stub.h" #include "KDesktopIface_stub.h" -#include "kwin.h" +#include "twin.h" #include <X11/Xlib.h> diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp index 9b19ee449..2abf26401 100644 --- a/konqueror/keditbookmarks/main.cpp +++ b/konqueror/keditbookmarks/main.cpp @@ -35,7 +35,7 @@ #include <kuniqueapplication.h> #include <kmessagebox.h> -#include <kwin.h> +#include <twin.h> #include <kbookmarkmanager.h> #include <kbookmarkexporter.h> diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc index ea02b6f6a..38ed82e02 100644 --- a/konqueror/konq_mainwindow.cc +++ b/konqueror/konq_mainwindow.cc @@ -93,7 +93,7 @@ #include <kurlrequesterdlg.h> #include <kurlrequester.h> #include <kuserprofile.h> -#include <kwin.h> +#include <twin.h> #include <kfiledialog.h> #include <klocale.h> #include <kiconloader.h> @@ -5272,7 +5272,7 @@ void KonqMainWindow::updateBookmarkBar() void KonqMainWindow::closeEvent( TQCloseEvent *e ) { kdDebug(1202) << "KonqMainWindow::closeEvent begin" << endl; - // This breaks session management (the window is withdrawn in kwin) + // This breaks session management (the window is withdrawn in twin) // so let's do this only when closed by the user. if ( static_cast<KonquerorApplication *>(kapp)->closedByUser() ) { diff --git a/konqueror/konq_misc.cc b/konqueror/konq_misc.cc index d0bf5e788..5c65e872f 100644 --- a/konqueror/konq_misc.cc +++ b/konqueror/konq_misc.cc @@ -28,7 +28,7 @@ #include <kurifilter.h> #include <klocale.h> #include <kstandarddirs.h> -#include <kwin.h> +#include <twin.h> #include <kprotocolinfo.h> #include <kurldrag.h> #include <kstartupinfo.h> diff --git a/konqueror/sidebar/trees/init/remote/web/kde_web.desktop b/konqueror/sidebar/trees/init/remote/web/kde_web.desktop index 4228c0b48..b5712eb1f 100644 --- a/konqueror/sidebar/trees/init/remote/web/kde_web.desktop +++ b/konqueror/sidebar/trees/init/remote/web/kde_web.desktop @@ -59,7 +59,7 @@ Name[pt]=Página do KDE Name[pt_BR]=Página principal do KDE Name[ro]=Site-ul KDE Name[ru]=Основной сайт KDE -Name[rw]=KDE Ipajikwinjira +Name[rw]=KDE Ipajitwinjira Name[se]=KDE-ruoktosiidu Name[sk]=Domovská stránka KDE Name[sl]=Domača stran KDE diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp index e6fc97b0e..7c9395da5 100644 --- a/konsole/konsole/konsole.cpp +++ b/konsole/konsole/konsole.cpp @@ -40,7 +40,7 @@ /*STATE: - konsole/kwin session management, parts stuff, config, menues + konsole/twin session management, parts stuff, config, menues are all in bad need for a complete rewrite. While the emulation core (TEmulation, TEVt102, TEScreen, TEWidget) diff --git a/konsole/konsole/konsole.h b/konsole/konsole/konsole.h index 4ca704a9b..cdf1ebad1 100644 --- a/konsole/konsole/konsole.h +++ b/konsole/konsole/konsole.h @@ -31,7 +31,7 @@ #include <ksimpleconfig.h> #include <keditcl.h> -#include <kwinmodule.h> +#include <twinmodule.h> #include <tqstrlist.h> #include <tqintdict.h> diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp index bec8271de..c03fd044f 100644 --- a/kpager/desktop.cpp +++ b/kpager/desktop.cpp @@ -30,8 +30,8 @@ #include <kdatastream.h> #include <kapplication.h> #include <kglobalsettings.h> -#include <kwinmodule.h> -#include <kwin.h> +#include <twinmodule.h> +#include <twin.h> #include <kconfig.h> #include <kglobal.h> #include <kdebug.h> @@ -129,7 +129,7 @@ void Desktop::mouseReleaseEvent( TQMouseEvent *ev ) KWin::WindowInfo *Desktop::windowAtPosition(const TQPoint &p, TQPoint *internalpos) { TQRect r; - const TQValueList<WId> &list(pager()->kwin()->stackingOrder()); + const TQValueList<WId> &list(pager()->twin()->stackingOrder()); if (list.count() <= 0) return 0L; @@ -476,9 +476,9 @@ void Desktop::paintEvent( TQPaintEvent * ) // draw text if ( sname && snumber ) - txt=TQString("%1. %2").arg(m_desk).arg(pager()->kwin()->desktopName( m_desk )); + txt=TQString("%1. %2").arg(m_desk).arg(pager()->twin()->desktopName( m_desk )); else if ( sname ) - txt=pager()->kwin()->desktopName( m_desk ); + txt=pager()->twin()->desktopName( m_desk ); else if ( snumber ) txt=TQString::number( m_desk ); p.drawText(2, 0, width()-4, height(), AlignCenter, txt ); @@ -487,8 +487,8 @@ void Desktop::paintEvent( TQPaintEvent * ) // paint windows if ( KPagerConfigDialog::m_showWindows ) { TQValueList<WId>::ConstIterator it; - for ( it = pager()->kwin()->stackingOrder().begin(); - it != pager()->kwin()->stackingOrder().end(); ++it ) { + for ( it = pager()->twin()->stackingOrder().begin(); + it != pager()->twin()->stackingOrder().end(); ++it ) { KWin::WindowInfo* info = pager()->info( *it ); @@ -519,7 +519,7 @@ void Desktop::paintWindowPlain(TQPainter &p, const KWin::WindowInfo *info, bool if ( !onDesktop ) r.moveTopLeft(TQPoint(0,0)); - bool isActive=(pager()->kwin()->activeWindow() == info->win()); + bool isActive=(pager()->twin()->activeWindow() == info->win()); TQBrush brush; @@ -638,7 +638,7 @@ KPager *Desktop::pager() const bool Desktop::isCurrent() const { - return pager()->kwin()->currentDesktop()==m_desk; + return pager()->twin()->currentDesktop()==m_desk; } void Desktop::backgroundLoaded(bool b) diff --git a/kpager/desktop.h b/kpager/desktop.h index bfaef5baf..56429342c 100644 --- a/kpager/desktop.h +++ b/kpager/desktop.h @@ -27,7 +27,7 @@ #include <tqwidget.h> #include <tqintdict.h> -#include <kwin.h> +#include <twin.h> class KSharedPixmap; class KPopupMenu; diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp index b8ecf9ddf..57a960bb7 100644 --- a/kpager/kpager.cpp +++ b/kpager/kpager.cpp @@ -50,8 +50,8 @@ #include <kconfig.h> #include <kdebug.h> #include <klocale.h> -#include <kwin.h> -#include <kwinmodule.h> +#include <twin.h> +#include <twinmodule.h> #include <netwm.h> #include "desktop.h" #include <tqpopupmenu.h> @@ -495,7 +495,7 @@ void KPager::slotDesktopNamesChanged() for ( int i=1; i <= (int) m_desktops.count(); ++i) { TQToolTip::remove(m_desktops[i-1]); - TQToolTip::add(m_desktops[i-1], kwin()->desktopName(i)); + TQToolTip::add(m_desktops[i-1], twin()->desktopName(i)); } update(); @@ -530,7 +530,7 @@ void KPager::slotNumberOfDesktopsChanged(int ndesktops) for (unsigned int d=m_desktops.count()+1;d<=nDesktops; d++) { - Desktop *dsk=new Desktop(d,kwin()->desktopName(d-1),this); + Desktop *dsk=new Desktop(d,twin()->desktopName(d-1),this); m_desktops.append(dsk); dsk->show(); } diff --git a/kpager/kpager.h b/kpager/kpager.h index b82b43dff..e88c2904f 100644 --- a/kpager/kpager.h +++ b/kpager/kpager.h @@ -28,7 +28,7 @@ #include <tqwidget.h> #include <tqintdict.h> #include <kmainwindow.h> -#include <kwin.h> +#include <twin.h> #include "kpagerIface.h" class KPager; @@ -67,7 +67,7 @@ public: KPager(KPagerMainWindow *parent=0, const char *name=0); ~KPager(); - class KWinModule *kwin() const { return m_winmodule; }; + class KWinModule *twin() const { return m_winmodule; }; void updateLayout(); void redrawDesktops(); diff --git a/kpersonalizer/README b/kpersonalizer/README index 96224a955..b93d9d15d 100644 --- a/kpersonalizer/README +++ b/kpersonalizer/README @@ -105,7 +105,7 @@ MacOS: - Mac- Keyboard-Scheme - use 2 clipboards for c&p (keyboard/mouse) (default) - Window-Behavior -> Focus on click -- Titlebar doubleclick -> Shade (for now. MacOS X has Minimize but this isn't offered by kwin yet) +- Titlebar doubleclick -> Shade (for now. MacOS X has Minimize but this isn't offered by twin yet) - Menubar on top - WindowList-menu on MMB - Walk trough windows mode: KDE diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp index ca9846cc3..fcc0fde7a 100644 --- a/kpersonalizer/keyecandypage.cpp +++ b/kpersonalizer/keyecandypage.cpp @@ -49,8 +49,8 @@ KEyeCandyPage::KEyeCandyPage(TQWidget *parent, const char *name ) : KEyeCandyPageDlg(parent,name) { - kwinconf = new KConfig("kwinrc", false, true); - kwineventconf = new KConfig("kwin.eventsrc", false, false); + twinconf = new KConfig("twinrc", false, true); + twineventconf = new KConfig("twin.eventsrc", false, false); kickerconf = new KConfig("kickerrc",false, false); konquerorconf = new KConfig("konquerorrc",false, false); konqiconconf = new KConfig("konqiconviewrc",false,false); @@ -131,8 +131,8 @@ KEyeCandyPage::KEyeCandyPage(TQWidget *parent, const char *name ) : KEyeCandyPag } KEyeCandyPage::~KEyeCandyPage(){ - delete kwinconf; - delete kwineventconf; + delete twinconf; + delete twineventconf; delete kickerconf; delete konquerorconf; delete konqiconconf; @@ -305,17 +305,17 @@ void KEyeCandyPage::enableDesktopWindowEffects(bool enable,bool restore){ // -Animate shade // -Enable Hover //-Enable move/resize on maximised windows - kwinconf->setGroup( "Windows" ); + twinconf->setGroup( "Windows" ); if(!restore){ - kwinconf->writeEntry("AnimateMinimize", enable ); - kwinconf->writeEntry("AnimateShade", enable ); - kwinconf->writeEntry("MoveResizeMaximizedWindows",enable); - kwinconf->writeEntry("ShadeHover", enable ); + twinconf->writeEntry("AnimateMinimize", enable ); + twinconf->writeEntry("AnimateShade", enable ); + twinconf->writeEntry("MoveResizeMaximizedWindows",enable); + twinconf->writeEntry("ShadeHover", enable ); } else { - kwinconf->writeEntry("AnimateMinimize", b_AnimateMinimize ); - kwinconf->writeEntry("AnimateShade", b_AnimateShade ); - kwinconf->writeEntry("MoveResizeMaximizedWindows",b_MoveResizeMaximizedWindows); - kwinconf->writeEntry("ShadeHover", b_ShadeHover); + twinconf->writeEntry("AnimateMinimize", b_AnimateMinimize ); + twinconf->writeEntry("AnimateShade", b_AnimateShade ); + twinconf->writeEntry("MoveResizeMaximizedWindows",b_MoveResizeMaximizedWindows); + twinconf->writeEntry("ShadeHover", b_ShadeHover); } } @@ -326,20 +326,20 @@ void KEyeCandyPage::enableDesktopWindowMovingContents(bool enable, bool restore) // -Display content in resizing window // And KGlobalSettings::opaqueResize() for QSplitters - kwinconf->setGroup( "Windows" ); + twinconf->setGroup( "Windows" ); KGlobal::config()->setGroup("KDE"); if (enable){ - kwinconf->writeEntry("ResizeMode","Opaque"); - kwinconf->writeEntry("MoveMode","Opaque"); + twinconf->writeEntry("ResizeMode","Opaque"); + twinconf->writeEntry("MoveMode","Opaque"); KGlobal::config()->writeEntry("OpaqueResize", true, true, true); } else { - kwinconf->writeEntry("ResizeMode","Transparent"); - kwinconf->writeEntry("MoveMode","Transparent"); + twinconf->writeEntry("ResizeMode","Transparent"); + twinconf->writeEntry("MoveMode","Transparent"); KGlobal::config()->writeEntry("OpaqueResize", false, true, true); } if(restore){ - kwinconf->writeEntry("ResizeMode",s_ResizeMode); - kwinconf->writeEntry("MoveMode",s_MoveMode); + twinconf->writeEntry("ResizeMode",s_ResizeMode); + twinconf->writeEntry("MoveMode",s_MoveMode); KGlobal::config()->writeEntry("OpaqueResize", b_OpaqueResize, true, true); } } @@ -547,49 +547,49 @@ void KEyeCandyPage::enablePreview(bool currSettings){ //----------------------------OTHER STUFF------------------------------------------------- /** Enables the default KDE sound scheme in Level 3 */ void KEyeCandyPage::enableSoundScheme(bool enable, bool user) { - kwineventconf->setGroup("desktop1"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop1 : 0) ); - kwineventconf->setGroup("desktop2"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop2 : 0) ); - kwineventconf->setGroup("desktop3"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop3 : 0) ); - kwineventconf->setGroup("desktop4"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop4 : 0) ); - kwineventconf->setGroup("desktop5"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop5 : 0) ); - kwineventconf->setGroup("desktop6"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop6 : 0) ); - kwineventconf->setGroup("desktop7"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop7 : 0) ); - kwineventconf->setGroup("desktop8"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop8 : 0) ); - - kwineventconf->setGroup("new"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.notold : 0) ); - kwineventconf->setGroup("close"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.close : 0) ); - - kwineventconf->setGroup("transnew"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.transnew : 0) ); - kwineventconf->setGroup("transdelete"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.transdelete : 0) ); - - kwineventconf->setGroup("iconify"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.iconify : 0) ); - kwineventconf->setGroup("deiconify"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.deiconify : 0) ); - kwineventconf->setGroup("maximize"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.maximize : 0) ); - kwineventconf->setGroup("unmaximize"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.unmaximize : 0) ); - kwineventconf->setGroup("shadeup"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.shadeup : 0) ); - kwineventconf->setGroup("shadedown"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.shadedown : 0) ); - kwineventconf->setGroup("sticky"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.sticky : 0) ); - kwineventconf->setGroup("unsticky"); - kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.unsticky : 0) ); + twineventconf->setGroup("desktop1"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop1 : 0) ); + twineventconf->setGroup("desktop2"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop2 : 0) ); + twineventconf->setGroup("desktop3"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop3 : 0) ); + twineventconf->setGroup("desktop4"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop4 : 0) ); + twineventconf->setGroup("desktop5"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop5 : 0) ); + twineventconf->setGroup("desktop6"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop6 : 0) ); + twineventconf->setGroup("desktop7"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop7 : 0) ); + twineventconf->setGroup("desktop8"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop8 : 0) ); + + twineventconf->setGroup("new"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.notold : 0) ); + twineventconf->setGroup("close"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.close : 0) ); + + twineventconf->setGroup("transnew"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.transnew : 0) ); + twineventconf->setGroup("transdelete"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.transdelete : 0) ); + + twineventconf->setGroup("iconify"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.iconify : 0) ); + twineventconf->setGroup("deiconify"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.deiconify : 0) ); + twineventconf->setGroup("maximize"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.maximize : 0) ); + twineventconf->setGroup("unmaximize"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.unmaximize : 0) ); + twineventconf->setGroup("shadeup"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.shadeup : 0) ); + twineventconf->setGroup("shadedown"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.shadedown : 0) ); + twineventconf->setGroup("sticky"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.sticky : 0) ); + twineventconf->setGroup("unsticky"); + twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.unsticky : 0) ); } /** Enable Antialiased fonts. Enable in Level 7. */ @@ -615,16 +615,16 @@ void KEyeCandyPage::save(bool currSettings){ // currSettings==true: save selections. currSettings==false: save user-def. saveCheckState(currSettings); // save all the KConfig-objects to their respective files - kwinconf->sync(); - kwineventconf->sync(); + twinconf->sync(); + twineventconf->sync(); konquerorconf->sync(); konqiconconf->sync(); kickerconf->sync(); kdesktopconf->sync(); KGlobal::config()->sync(); - // restart kwin for window effects + // restart twin for window effects kapp->dcopClient()->send("knotify", "Notify", "reconfigure()", TQString("")); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); + kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); // set the display options (style effects) KIPC::sendMessageAll(KIPC::SettingsChanged); TQApplication::syncX(); @@ -730,63 +730,63 @@ void KEyeCandyPage::getUserDefaults(){ konq_dont_prev=konqiconconf->readListEntry("DontPreview"); b_konq_prev_sound=konqiconconf->readBoolEntry("EnableSoundPreviews", false); b_konq_prev_enable=konqiconconf->readBoolEntry("PreviewsEnabled", true); - kwinconf->setGroup( "Windows" ); - s_ResizeMode=kwinconf->readEntry("ResizeMode", "Transparent"); - s_MoveMode=kwinconf->readEntry("MoveMode", "Opaque"); + twinconf->setGroup( "Windows" ); + s_ResizeMode=twinconf->readEntry("ResizeMode", "Transparent"); + s_MoveMode=twinconf->readEntry("MoveMode", "Opaque"); - b_AnimateMinimize=kwinconf->readBoolEntry("AnimateMinimize", true ); - b_AnimateShade=kwinconf->readBoolEntry("AnimateShade", true ); - b_MoveResizeMaximizedWindows=kwinconf->readBoolEntry("MoveResizeMaximizedWindows",true); - b_ShadeHover = kwinconf->readBoolEntry("ShadeHover", false); + b_AnimateMinimize=twinconf->readBoolEntry("AnimateMinimize", true ); + b_AnimateShade=twinconf->readBoolEntry("AnimateShade", true ); + b_MoveResizeMaximizedWindows=twinconf->readBoolEntry("MoveResizeMaximizedWindows",true); + b_ShadeHover = twinconf->readBoolEntry("ShadeHover", false); getUserSoundScheme(); } /** gets the users sound-settings */ void KEyeCandyPage::getUserSoundScheme() { - kwineventconf->setGroup("desktop1"); - st_UserSnd.desktop1 = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("desktop2"); - st_UserSnd.desktop2 = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("desktop3"); - st_UserSnd.desktop3 = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("desktop4"); - st_UserSnd.desktop4 = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("desktop5"); - st_UserSnd.desktop5 = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("desktop6"); - st_UserSnd.desktop6 = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("desktop7"); - st_UserSnd.desktop7 = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("desktop8"); - st_UserSnd.desktop8 = kwineventconf->readNumEntry("presentation", 0); - - kwineventconf->setGroup("new"); - st_UserSnd.notold = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("close"); - st_UserSnd.close = kwineventconf->readNumEntry("presentation", 0); - - kwineventconf->setGroup("transnew"); - st_UserSnd.transnew = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("transdelete"); - st_UserSnd.transdelete = kwineventconf->readNumEntry("presentation", 0); - - kwineventconf->setGroup("iconify"); - st_UserSnd.iconify = kwineventconf->readNumEntry("presentation", 0 ); - kwineventconf->setGroup("deiconify"); - st_UserSnd.deiconify = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("maximize"); - st_UserSnd.maximize = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("unmaximize"); - st_UserSnd.unmaximize = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("shadeup"); - st_UserSnd.shadeup = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("shadedown"); - st_UserSnd.shadedown = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("sticky"); - st_UserSnd.sticky = kwineventconf->readNumEntry("presentation", 0); - kwineventconf->setGroup("unsticky"); - st_UserSnd.unsticky = kwineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("desktop1"); + st_UserSnd.desktop1 = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("desktop2"); + st_UserSnd.desktop2 = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("desktop3"); + st_UserSnd.desktop3 = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("desktop4"); + st_UserSnd.desktop4 = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("desktop5"); + st_UserSnd.desktop5 = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("desktop6"); + st_UserSnd.desktop6 = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("desktop7"); + st_UserSnd.desktop7 = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("desktop8"); + st_UserSnd.desktop8 = twineventconf->readNumEntry("presentation", 0); + + twineventconf->setGroup("new"); + st_UserSnd.notold = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("close"); + st_UserSnd.close = twineventconf->readNumEntry("presentation", 0); + + twineventconf->setGroup("transnew"); + st_UserSnd.transnew = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("transdelete"); + st_UserSnd.transdelete = twineventconf->readNumEntry("presentation", 0); + + twineventconf->setGroup("iconify"); + st_UserSnd.iconify = twineventconf->readNumEntry("presentation", 0 ); + twineventconf->setGroup("deiconify"); + st_UserSnd.deiconify = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("maximize"); + st_UserSnd.maximize = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("unmaximize"); + st_UserSnd.unmaximize = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("shadeup"); + st_UserSnd.shadeup = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("shadedown"); + st_UserSnd.shadedown = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("sticky"); + st_UserSnd.sticky = twineventconf->readNumEntry("presentation", 0); + twineventconf->setGroup("unsticky"); + st_UserSnd.unsticky = twineventconf->readNumEntry("presentation", 0); } /** calls all enable functions with the state of the checkboxes. This is needed for save() only, diff --git a/kpersonalizer/keyecandypage.h b/kpersonalizer/keyecandypage.h index d78fb5110..e817e908d 100644 --- a/kpersonalizer/keyecandypage.h +++ b/kpersonalizer/keyecandypage.h @@ -179,8 +179,8 @@ private: } st_UserSnd; // DEFAULT VALLUES SET BY USER (END) - KConfig* kwinconf; - KConfig* kwineventconf; + KConfig* twinconf; + KConfig* twineventconf; KConfig* kickerconf; KConfig* konquerorconf; KConfig* konqiconconf; diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp index 5dda31ae3..30841aefe 100644 --- a/kpersonalizer/kospage.cpp +++ b/kpersonalizer/kospage.cpp @@ -43,7 +43,7 @@ KOSPage::KOSPage(TQWidget *parent, const char *name ) : KOSPageDlg(parent,name) // Set the configfiles cglobal = new KConfig("kdeglobals"); claunch = new KConfig("klaunchrc", false, false); - cwin = new KConfig("kwinrc"); + cwin = new KConfig("twinrc"); cdesktop = new KConfig("kdesktoprc"); ckcminput = new KConfig("kcminputrc"); ckcmdisplay = new KConfig("kcmdisplayrc"); @@ -92,8 +92,8 @@ void KOSPage::save(bool currSettings){ // Tell kdesktop about the new config file kapp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", TQByteArray()); /////////////////////////////////////////// - /// restart kwin for window effects - kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); + /// restart twin for window effects + kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); /////////////////////////////////////////// // Make the kaccess daemon read the changed config file diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp index d02f9b028..6c9908648 100644 --- a/kpersonalizer/kstylepage.cpp +++ b/kpersonalizer/kstylepage.cpp @@ -78,9 +78,9 @@ KStylePage::KStylePage(TQWidget *parent, const char *name ) : KStylePageDlg(pare connect(klv_styles, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCurrentChanged())); - // Note: if the default is changed here it needs to be changed in kdebase/kwin/plugins.cpp - // and kdebase/kwin/kcmkwin/kwindecoration/kwindecoration.cpp as well. - defaultKWinStyle = TQPixmap::defaultDepth() > 8 ? "kwin_plastik" : "kwin_quartz"; + // Note: if the default is changed here it needs to be changed in kdebase/twin/plugins.cpp + // and kdebase/twin/kcmtwin/twindecoration/twindecoration.cpp as well. + defaultKWinStyle = TQPixmap::defaultDepth() > 8 ? "twin_plastik" : "twin_quartz"; appliedStyle = NULL; getAvailability(); @@ -89,7 +89,7 @@ KStylePage::KStylePage(TQWidget *parent, const char *name ) : KStylePageDlg(pare } KStylePage::~KStylePage(){ - delete ckwin; + delete ctwin; delete appliedStyle; } @@ -115,39 +115,39 @@ void KStylePage::saveStyle(bool curSettings){ /** save the KWin-style*/ void KStylePage::saveKWin(bool curSettings){ - TQString kwin = origKWinStyle; + TQString twin = origKWinStyle; if(curSettings) { KDesktopFile* kdf = 0L; KStandardDirs* kstd = KGlobal::dirs(); - if (cde->isSelected() && kwin_cde_exist) - kdf = new KDesktopFile(kstd->findResource("data", "kwin/cde.desktop")); - else if (win->isSelected() && kwin_win_exist) - kdf = new KDesktopFile(kstd->findResource("data", "kwin/redmond.desktop")); - else if (platinum->isSelected() && kwin_system_exist) - kdf = new KDesktopFile(kstd->findResource("data", "kwin/system.desktop")); - else if (keramik->isSelected() && kwin_keramik_exist) - kdf = new KDesktopFile(kstd->findResource("data", "kwin/keramik.desktop")); + if (cde->isSelected() && twin_cde_exist) + kdf = new KDesktopFile(kstd->findResource("data", "twin/cde.desktop")); + else if (win->isSelected() && twin_win_exist) + kdf = new KDesktopFile(kstd->findResource("data", "twin/redmond.desktop")); + else if (platinum->isSelected() && twin_system_exist) + kdf = new KDesktopFile(kstd->findResource("data", "twin/system.desktop")); + else if (keramik->isSelected() && twin_keramik_exist) + kdf = new KDesktopFile(kstd->findResource("data", "twin/keramik.desktop")); else if (kde->isSelected()) { - if (kwin_plastik_exist && (TQColor::numBitPlanes() > 8)) - kdf = new KDesktopFile(kstd->findResource("data", "kwin/plastik.desktop")); - else if (kwin_quartz_exist) - kdf = new KDesktopFile(kstd->findResource("data", "kwin/quartz.desktop")); + if (twin_plastik_exist && (TQColor::numBitPlanes() > 8)) + kdf = new KDesktopFile(kstd->findResource("data", "twin/plastik.desktop")); + else if (twin_quartz_exist) + kdf = new KDesktopFile(kstd->findResource("data", "twin/quartz.desktop")); } if (kdf) { kdf->setGroup("Desktop Entry"); - kwin = kdf->readEntry("X-KDE-Library", defaultKWinStyle); + twin = kdf->readEntry("X-KDE-Library", defaultKWinStyle); delete kdf; } else { // if we get here classic is selected (there's no .desktop file for the - // kde2 kwin style), or none of the other kwin styles were found. - kwin = "kwin_default"; + // kde2 twin style), or none of the other twin styles were found. + twin = "twin_default"; } } - ckwin->writeEntry("PluginLib", kwin); - ckwin->sync(); - kdDebug() << "KStylePage::saveKWin(): " << kwin << endl; + ctwin->writeEntry("PluginLib", twin); + ctwin->sync(); + kdDebug() << "KStylePage::saveKWin(): " << twin << endl; } /** Save the color-scheme */ @@ -411,7 +411,7 @@ void KStylePage::getColors(colorSet *set, bool colorfile ){ delete config; } -/** Test widget- and kwin- styles for availability */ +/** Test widget- and twin- styles for availability */ void KStylePage::getAvailability() { // test, wich styles are available kde_keramik_exist = kde_hc_exist = kde_def_exist = cde_exist @@ -436,23 +436,23 @@ void KStylePage::getAvailability() { if (!platinum_exist) platinum->tqsetVisible(false); // test, wich KWin-styles are available - kwin_keramik_exist = kwin_system_exist = kwin_plastik_exist - = kwin_default_exist = kwin_win_exist - = kwin_cde_exist = kwin_quartz_exist = false; + twin_keramik_exist = twin_system_exist = twin_plastik_exist + = twin_default_exist = twin_win_exist + = twin_cde_exist = twin_quartz_exist = false; KStandardDirs* kstd = KGlobal::dirs(); - if (!kstd->findResource("data", "kwin/keramik.desktop").isNull()) - kwin_keramik_exist = true; - if (!kstd->findResource("data", "kwin/plastik.desktop").isNull()) - kwin_plastik_exist = true; - if (!kstd->findResource("data", "kwin/system.desktop").isNull()) - kwin_system_exist = true; - if (!kstd->findResource("data", "kwin/redmond.desktop").isNull()) - kwin_win_exist = true; - if (!kstd->findResource("data", "kwin/cde.desktop").isNull()) - kwin_cde_exist = true; - if (!kstd->findResource("data", "kwin/quartz.desktop").isNull()) - kwin_quartz_exist = true; - kwin_default_exist = true; // we can't check for a .desktop-file for the old default because there is none + if (!kstd->findResource("data", "twin/keramik.desktop").isNull()) + twin_keramik_exist = true; + if (!kstd->findResource("data", "twin/plastik.desktop").isNull()) + twin_plastik_exist = true; + if (!kstd->findResource("data", "twin/system.desktop").isNull()) + twin_system_exist = true; + if (!kstd->findResource("data", "twin/redmond.desktop").isNull()) + twin_win_exist = true; + if (!kstd->findResource("data", "twin/cde.desktop").isNull()) + twin_cde_exist = true; + if (!kstd->findResource("data", "twin/quartz.desktop").isNull()) + twin_quartz_exist = true; + twin_default_exist = true; // we can't check for a .desktop-file for the old default because there is none // check, wich Icon-themes are available icon_crystalsvg_exist = icon_kdeclassic_exist = icon_Locolor_exist = false; @@ -473,9 +473,9 @@ void KStylePage::getUserDefaults() { origStyle = KGlobal::config()->readEntry( "widgetStyle", KStyle::defaultStyle() ); // get the user's current KWin-style - ckwin = new KConfig("kwinrc"); - ckwin->setGroup("Style"); - origKWinStyle = ckwin->readEntry("PluginLib", defaultKWinStyle); + ctwin = new KConfig("twinrc"); + ctwin->setGroup("Style"); + origKWinStyle = ctwin->readEntry("PluginLib", defaultKWinStyle); // get the users current colors getColors(&usrColors, false); @@ -521,8 +521,8 @@ void KStylePage::liveUpdate() { KIPC::sendMessageAll(KIPC::StyleChanged); // color palette changes KIPC::sendMessageAll(KIPC::PaletteChanged); - // kwin-style - kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); + // twin-style + kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); // kdesktop-background kapp->dcopClient()->send("kdesktop", "KBackgroundIface", "configure()", TQString("")); } diff --git a/kpersonalizer/kstylepage.h b/kpersonalizer/kstylepage.h index f215e7e8d..a82168768 100644 --- a/kpersonalizer/kstylepage.h +++ b/kpersonalizer/kstylepage.h @@ -44,7 +44,7 @@ private: TQString origIcons; TQString defaultKWinStyle; TQString currentStyle; - KConfig* ckwin; + KConfig* ctwin; struct colorSet { TQString colorFile, bgMode; int contrast; @@ -96,9 +96,9 @@ private: bool kde_hc_exist, kde_def_exist, kde_keramik_exist, kde_light_exist, cde_exist, win_exist, platinum_exist, kde_plastik_exist; - // kwin-style-existence - bool kwin_keramik_exist, kwin_default_exist, kwin_system_exist, - kwin_win_exist, kwin_cde_exist, kwin_quartz_exist, kwin_plastik_exist; + // twin-style-existence + bool twin_keramik_exist, twin_default_exist, twin_system_exist, + twin_win_exist, twin_cde_exist, twin_quartz_exist, twin_plastik_exist; // icon-theme-existence bool icon_crystalsvg_exist, icon_kdeclassic_exist, icon_Locolor_exist; diff --git a/krootbacking/krootbacking.cpp b/krootbacking/krootbacking.cpp index c105f8d57..abc7df4cc 100644 --- a/krootbacking/krootbacking.cpp +++ b/krootbacking/krootbacking.cpp @@ -25,8 +25,8 @@ #include <kapplication.h> #include <kimageeffect.h> #include <kpixmapio.h> -#include <kwinmodule.h> -#include <kwin.h> +#include <twinmodule.h> +#include <twin.h> #include <kdebug.h> #include <netwm.h> #include <dcopclient.h> @@ -46,7 +46,7 @@ class KRootBackingData public: TQWidget *toplevel; #ifdef Q_WS_X11 - KWinModule *kwin; + KWinModule *twin; #endif }; @@ -71,7 +71,7 @@ void KRootBacking::init() #ifdef Q_WS_X11 connect(m_pPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool))); - d->kwin = new KWinModule( this ); + d->twin = new KWinModule( this ); #endif m_bInit = true; diff --git a/ksmserver/README b/ksmserver/README index 759e57c9d..d6779c070 100644 --- a/ksmserver/README +++ b/ksmserver/README @@ -28,11 +28,11 @@ The server is usually started from the 'startkde' script. It supports the follow -r, --restore Restores the previous session if available -w, --windowmanager <wm> Starts 'wm' in case no other window manager is - participating in the session. Default is 'kwin' + participating in the session. Default is 'twin' The default 'startkde' launches 'ksmserver --restore'. The 'windowmanager' option is useful for users that prefer a window -manager other than kwin. Since the window manager has to participate +manager other than twin. Since the window manager has to participate in the session (it has to remember window positions and states), it is usually restarted when the session is restored. To be *really* sure that this happens, even if the wm might have crashed during the diff --git a/ksmserver/legacy.cpp b/ksmserver/legacy.cpp index 186fdcf64..ad190185e 100644 --- a/ksmserver/legacy.cpp +++ b/ksmserver/legacy.cpp @@ -50,7 +50,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kconfig.h> #include <kdebug.h> -#include <kwinmodule.h> +#include <twinmodule.h> #include <X11/Xlib.h> #include <X11/Xutil.h> @@ -239,7 +239,7 @@ void KSMServer::restoreLegacySession( KConfig* config ) if( config->hasGroup( "Legacy" + sessionGroup )) { KConfigGroupSaver saver( config, "Legacy" + sessionGroup ); restoreLegacySessionInternal( config ); - } else if( wm == "kwin" ) { // backwards comp. - get it from kwinrc + } else if( wm == "twin" ) { // backwards comp. - get it from twinrc KConfigGroupSaver saver( config, sessionGroup ); int count = config->readNumEntry( "count", 0 ); for ( int i = 1; i <= count; i++ ) { diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp index 5ac04acf3..8e2270068 100644 --- a/ksmserver/main.cpp +++ b/ksmserver/main.cpp @@ -34,7 +34,7 @@ static const KCmdLineOptions options[] = { "r", 0, 0 }, { "restore", I18N_NOOP("Restores the saved user session if available"), 0}, { "w", 0, 0 }, - { "windowmanager <wm>", I18N_NOOP("Starts 'wm' in case no other window manager is \nparticipating in the session. Default is 'kwin'"), 0}, + { "windowmanager <wm>", I18N_NOOP("Starts 'wm' in case no other window manager is \nparticipating in the session. Default is 'twin'"), 0}, { "nolocal", I18N_NOOP("Also allow remote connections"), 0}, KCmdLineLastOption }; @@ -204,7 +204,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] ) TQCString wm = args->getOption("windowmanager"); if ( wm.isEmpty() ) - wm = "kwin"; + wm = "twin"; bool only_local = args->isSet("local"); #ifndef HAVE__ICETRANSNOLISTEN diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp index ac4ef0e28..91cfb7544 100644 --- a/ksmserver/server.cpp +++ b/ksmserver/server.cpp @@ -911,9 +911,9 @@ bool KSMServer::isWM( const TQString& program ) const { // KWin relies on ksmserver's special treatment in phase1, // therefore make sure it's recognized even if ksmserver - // was initially started with different WM, and kwin replaced + // was initially started with different WM, and twin replaced // it later - return ((program == wm) || (program == "kwin")); + return ((program == wm) || (program == "twin")); } bool KSMServer::isCM( const KSMClient* client ) const diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index d715cf277..3df6870b7 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/ksmserver/shutdowndlg.cpp @@ -37,7 +37,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> #include <kguiitem.h> #include <kiconloader.h> #include <kglobalsettings.h> -#include <kwin.h> +#include <twin.h> #include <kuser.h> #include <kpixmap.h> #include <kimageeffect.h> diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp index 00cf57714..bd2fe440f 100644 --- a/ksmserver/startup.cpp +++ b/ksmserver/startup.cpp @@ -76,7 +76,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <kprocess.h> #include <dcopclient.h> #include <dcopref.h> -#include <kwinmodule.h> +#include <twinmodule.h> #include <knotifyclient.h> #include "server.h" diff --git a/ksmserver/startupdlg.cpp b/ksmserver/startupdlg.cpp index 43e12c075..2d42dd3a2 100644 --- a/ksmserver/startupdlg.cpp +++ b/ksmserver/startupdlg.cpp @@ -37,7 +37,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org> #include <kguiitem.h> #include <kiconloader.h> #include <kglobalsettings.h> -#include <kwin.h> +#include <twin.h> #include <kuser.h> #include <kpixmap.h> #include <kimageeffect.h> diff --git a/ksplashml/themeengine/standard/wndicon.cpp b/ksplashml/themeengine/standard/wndicon.cpp index 037a27543..13c8ea002 100644 --- a/ksplashml/themeengine/standard/wndicon.cpp +++ b/ksplashml/themeengine/standard/wndicon.cpp @@ -19,7 +19,7 @@ #include <kdebug.h> #include <kdebug.h> #include <kglobalsettings.h> -#include <kwin.h> +#include <twin.h> #include <tqdesktopwidget.h> #include <tqhbox.h> diff --git a/ksplashml/themeengine/standard/wndstatus.cpp b/ksplashml/themeengine/standard/wndstatus.cpp index 6227de9b1..691017e73 100644 --- a/ksplashml/themeengine/standard/wndstatus.cpp +++ b/ksplashml/themeengine/standard/wndstatus.cpp @@ -16,7 +16,7 @@ #include <kglobalsettings.h> #include <kiconloader.h> #include <kprogress.h> -#include <kwin.h> +#include <twin.h> #include <tqdesktopwidget.h> #include <tqhbox.h> diff --git a/ksplashml/themeengine/themeengine.cpp b/ksplashml/themeengine/themeengine.cpp index 9d86f264c..f0e51c53c 100644 --- a/ksplashml/themeengine/themeengine.cpp +++ b/ksplashml/themeengine/themeengine.cpp @@ -18,7 +18,7 @@ #include <kconfig.h> #include <kdebug.h> #include <kglobal.h> -#include <kwin.h> +#include <twin.h> #include <tqevent.h> #include <tqfile.h> diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp index 5287df4cd..ab348e1cc 100644 --- a/ksplashml/wndmain.cpp +++ b/ksplashml/wndmain.cpp @@ -21,7 +21,7 @@ #include <kmessagebox.h> #include <kstandarddirs.h> #include <ktrader.h> -#include <kwin.h> +#include <twin.h> #include <dcopclient.h> #include <tqdir.h> diff --git a/kstart/kstart.cpp b/kstart/kstart.cpp index 410a1acb8..411ba9a0f 100644 --- a/kstart/kstart.cpp +++ b/kstart/kstart.cpp @@ -19,8 +19,8 @@ #include <kdebug.h> #include <kprocess.h> #include <klocale.h> -#include <kwin.h> -#include <kwinmodule.h> +#include <twin.h> +#include <twinmodule.h> #include <kapplication.h> #include <kaboutdata.h> #include <kcmdlineargs.h> @@ -43,7 +43,7 @@ static bool fullscreen = false; static unsigned long state = 0; static unsigned long mask = 0; static NET::WindowType windowtype = NET::Unknown; -static KWinModule* kwinmodule; +static KWinModule* twinmodule; KStart::KStart() :TQObject() @@ -55,9 +55,9 @@ KStart::KStart() sendRule(); else { // connect to window add to get the NEW windows - connect(kwinmodule, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId))); + connect(twinmodule, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId))); if (windowtitle != 0) - kwinmodule->doNotManage( windowtitle ); + twinmodule->doNotManage( windowtitle ); } // propagate the app startup notification info to the started app KStartupInfoId id; @@ -97,7 +97,7 @@ void KStart::sendRule() { // accept only "normal" windows message += "types=" + TQCString().setNum( NET::NormalMask | NET::DialogMask ) + "\n"; } - if ( ( desktop > 0 && desktop <= kwinmodule->numberOfDesktops() ) + if ( ( desktop > 0 && desktop <= twinmodule->numberOfDesktops() ) || desktop == NETWinInfo::OnAllDesktops ) { message += "desktop=" + TQCString().setNum( desktop ) + "\ndesktoprule=3\n"; } @@ -206,7 +206,7 @@ void KStart::applyStyle(WId w ) { NETWinInfo info( qt_xdisplay(), w, qt_xrootwin(), NET::WMState ); - if ( ( desktop > 0 && desktop <= kwinmodule->numberOfDesktops() ) + if ( ( desktop > 0 && desktop <= twinmodule->numberOfDesktops() ) || desktop == NETWinInfo::OnAllDesktops ) info.setDesktop( desktop ); @@ -312,13 +312,13 @@ int main( int argc, char *argv[] ) for(int i=0; i < args->count(); i++) proc << args->arg(i); - kwinmodule = new KWinModule; + twinmodule = new KWinModule; desktop = args->getOption( "desktop" ).toInt(); if ( args->isSet ( "alldesktops") ) desktop = NETWinInfo::OnAllDesktops; if ( args->isSet ( "currentdesktop") ) - desktop = kwinmodule->currentDesktop(); + desktop = twinmodule->currentDesktop(); windowtitle = args->getOption( "window" ); windowclass = args->getOption( "windowclass" ); diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cc index 6bc3d8398..648b0ec1f 100644 --- a/ksysguard/gui/ksysguard.cc +++ b/ksysguard/gui/ksysguard.cc @@ -50,8 +50,8 @@ #include <kstandarddirs.h> #include <kstatusbar.h> #include <kstdaction.h> -#include <kwin.h> -#include <kwinmodule.h> +#include <twin.h> +#include <twinmodule.h> #include <dnssd/remoteservice.h> diff --git a/ksysguard/gui/ksysguard.h b/ksysguard/gui/ksysguard.h index f8e8c15c6..fe2e7fce1 100644 --- a/ksysguard/gui/ksysguard.h +++ b/ksysguard/gui/ksysguard.h @@ -59,7 +59,7 @@ class TopLevel : public KMainWindow, public KSGRD::SensorClient, public DCOPObje void initStatusBar(); k_dcop: - // calling ksysguard with kwin/kicker hot-key + // calling ksysguard with twin/kicker hot-key ASYNC showProcesses(); ASYNC showOnCurrentDesktop(); ASYNC loadWorkSheet( const TQString &fileName ); diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp index 3fd228a30..3ec2be165 100644 --- a/ksystraycmd/ksystraycmd.cpp +++ b/ksystraycmd/ksystraycmd.cpp @@ -10,7 +10,7 @@ #include <klocale.h> #include <kpopupmenu.h> #include <kprocess.h> -#include <kwinmodule.h> +#include <twinmodule.h> #include <kconfig.h> #include <ksystemtray.h> @@ -23,10 +23,10 @@ KSysTrayCmd::KSysTrayCmd() : TQLabel( 0, "systray_cmd" ), isVisible(true), lazyStart( false ), noquit( false ), quitOnHide( false ), onTop(false), ownIcon(false), - win(0), client(0), kwinmodule(0), top(0), left(0) + win(0), client(0), twinmodule(0), top(0), left(0) { tqsetAlignment( AlignCenter ); - kwinmodule = new KWinModule( TQT_TQOBJECT(this) ); + twinmodule = new KWinModule( TQT_TQOBJECT(this) ); refresh(); } @@ -114,8 +114,8 @@ void KSysTrayCmd::setTargetWindow( WId w ) void KSysTrayCmd::setTargetWindow( const KWin::WindowInfo &info ) { - disconnect( kwinmodule, TQT_SIGNAL(windowAdded(WId)), this, TQT_SLOT(windowAdded(WId)) ); - connect( kwinmodule, TQT_SIGNAL(windowChanged(WId)), TQT_SLOT(windowChanged(WId)) ); + disconnect( twinmodule, TQT_SIGNAL(windowAdded(WId)), this, TQT_SLOT(windowAdded(WId)) ); + connect( twinmodule, TQT_SIGNAL(windowChanged(WId)), TQT_SLOT(windowChanged(WId)) ); win = info.win(); KWin::setSystemTrayWindowFor( winId(), win ); refresh(); @@ -179,7 +179,7 @@ bool KSysTrayCmd::startClient() { client = new KShellProcess(); *client << command; - connect( kwinmodule, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId)) ); + connect( twinmodule, TQT_SIGNAL(windowAdded(WId)), TQT_SLOT(windowAdded(WId)) ); connect( client, TQT_SIGNAL( processExited(KProcess *) ), this, TQT_SLOT( clientExited() ) ); @@ -265,7 +265,7 @@ void KSysTrayCmd::execContextMenu( const TQPoint &pos ) void KSysTrayCmd::checkExistingWindows() { TQValueList<WId>::ConstIterator it; - for ( it = kwinmodule->windows().begin(); it != kwinmodule->windows().end(); ++it ) { + for ( it = twinmodule->windows().begin(); it != twinmodule->windows().end(); ++it ) { windowAdded( *it ); if ( win ) break; diff --git a/ksystraycmd/ksystraycmd.h b/ksystraycmd/ksystraycmd.h index b8af38785..abad3ec57 100644 --- a/ksystraycmd/ksystraycmd.h +++ b/ksystraycmd/ksystraycmd.h @@ -4,7 +4,7 @@ #define KSYSTRAYCMD_H #include <tqlabel.h> -#include <kwin.h> +#include <twin.h> class KShellProcess; class KWinModule; @@ -77,7 +77,7 @@ private: WId win; KShellProcess *client; - KWinModule *kwinmodule; + KWinModule *twinmodule; TQString errStr; /** Memorized 'top' position of the window*/ diff --git a/ktip/ktipwindow.cpp b/ktip/ktipwindow.cpp index 213b4189f..8281c13e2 100644 --- a/ktip/ktipwindow.cpp +++ b/ktip/ktipwindow.cpp @@ -26,7 +26,7 @@ #include <kstandarddirs.h> #include <ktip.h> #include <kuniqueapplication.h> -#include <kwin.h> +#include <twin.h> #include <stdlib.h> static const char description[] = I18N_NOOP("Useful tips"); diff --git a/kwin/CMakeLists.txt b/kwin/CMakeLists.txt index 418ed1e88..cfdcf5e18 100644 --- a/kwin/CMakeLists.txt +++ b/kwin/CMakeLists.txt @@ -9,11 +9,11 @@ # ################################################# -project( kwin ) +project( twin ) add_subdirectory( lib ) add_subdirectory( killer ) -add_subdirectory( kcmkwin ) +add_subdirectory( kcmtwin ) add_subdirectory( pics ) add_subdirectory( clients ) add_subdirectory( oldheaders ) @@ -40,14 +40,14 @@ install( FILES KWinInterface.h DESTINATION ${INCLUDE_INSTALL_DIR} ) ##### other data ################################ -tde_install_icons( kwin ) -install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/kwin ) -install( FILES kwin.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) +tde_install_icons( twin ) +install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/twin ) +install( FILES twin.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) -##### kwin (tdeinit) ############################ +##### twin (tdeinit) ############################ -set( target kwin ) +set( target twin ) set( ${target}_SRCS workspace.cpp client.cpp placement.cpp atoms.cpp diff --git a/kwin/COMPLIANCE b/kwin/COMPLIANCE index 0940d2b32..7ae943630 100644 --- a/kwin/COMPLIANCE +++ b/kwin/COMPLIANCE @@ -11,8 +11,8 @@ Listed below are all the NetWM (or EWM) hints decided upon on freedesktop.org compliance with the spec. Some parts also involve the pager and clients which this document will cater for as well where applicable. -If you modify the level of NetWM compliance (via modification of kwin/*, -tdecore/netwm.* or tdecore/kwin.* etc.), or notice any new hints that +If you modify the level of NetWM compliance (via modification of twin/*, +tdecore/netwm.* or tdecore/twin.* etc.), or notice any new hints that were added after version 1.2, please modify this document appropriately. Properties are ordered in the table in the order they are found in the specification. To list any important notes regarding a property, just @@ -26,7 +26,7 @@ _NET_NUMBER_OF_DESKTOPS root window property done +----------------------------------------------------------------+ If you have any questions regarding the specification, feel free to ask on the KWin -mailing list <kwin@kde.org>, or on the Window Manager Spec list <wm-spec-list@gnome.org>. +mailing list <twin@kde.org>, or on the Window Manager Spec list <wm-spec-list@gnome.org>. -- Karol <kszwed@kde.org> ( diff --git a/kwin/CONFIGURING b/kwin/CONFIGURING index 4a2774149..c2c1e74da 100644 --- a/kwin/CONFIGURING +++ b/kwin/CONFIGURING @@ -36,35 +36,35 @@ To create such window-specific setting automatically without a need of doing it manually for every user (for example when doing a large deployment), follow these steps: -- Back up your $KDEHOME/share/config/kwinrulesrc ($KDEHOME usually being $HOME/.kde) +- Back up your $KDEHOME/share/config/twinrulesrc ($KDEHOME usually being $HOME/.kde) and remove it -- Run 'dcop kwin default reconfigure' +- Run 'dcop twin default reconfigure' - Create manually all window-specific settings that should be included (see above) - When done, check in Window-specific settings configuration module (Alt+F3/Configure window behavior/Window-specific settings) that all rules are included -- Create a copy of $KDEHOME/share/config/kwinrulesrc and restore the original one -- Rename the copy (i.e. the newly created kwinrulesrc) to have its unique name +- Create a copy of $KDEHOME/share/config/twinrulesrc and restore the original one +- Rename the copy (i.e. the newly created twinrulesrc) to have its unique name (e.g. foobar_fix_maxsize in this example case) - Be careful with manual modifications of the file, especially make sure the count= field in the [General] group is updated if needed -- Create a file for kconfig_update like this (named kwin_foobar_fix_maxsize.upd +- Create a file for kconfig_update like this (named twin_foobar_fix_maxsize.upd in this example): -# kwin_foobar_fix_maxsize.upd start # +# twin_foobar_fix_maxsize.upd start # Id=foobar_fix_maxsize -File=kwinrules_update +File=twinrules_update Group=Dummy Options=overwrite ScriptArguments=foobar_fix_maxsize -Script=kwin_update_default_rules +Script=twin_update_default_rules -# kwin_foobar_fix_maxsize.upd end # +# twin_foobar_fix_maxsize.upd end # -- The kconfig_file (kwin_foobar_fix_maxsize.upd) is to be placed +- The kconfig_file (twin_foobar_fix_maxsize.upd) is to be placed in $KDEDIR/share/apps/kconf_update/ - The file with the window-specific settings (foobar_fix_maxsize) is to be placed - in $KDEDIR/share/apps/kwin/default_rules/ + in $KDEDIR/share/apps/twin/default_rules/ All KDE user accounts should have these new window-specific settings added diff --git a/kwin/HACKING b/kwin/HACKING index f92c0e3fc..3dcd579f3 100644 --- a/kwin/HACKING +++ b/kwin/HACKING @@ -1,12 +1,12 @@ Mailing list and bugzilla: ========================== -The KWin mailing list is kwin@kde.org . It's rather low traffic. +The KWin mailing list is twin@kde.org . It's rather low traffic. -The bugs.kde.org product for KWin is 'kwin'. Currently the components are 'general' (KWin core), +The bugs.kde.org product for KWin is 'twin'. Currently the components are 'general' (KWin core), 'decorations' (decoration plugins), 'compatibility' (problems with non-KDE WMs/apps) and 'eyecandy' (transparency and similar effects). -There are also two kcontrol components 'kcmkwindecoration' and 'kcmkwinoptions' related +There are also two kcontrol components 'kcmtwindecoration' and 'kcmtwinoptions' related to KWin's KControl modules. @@ -14,20 +14,20 @@ KWin parts: =========== There are four parts of KWin: -- The KWin core, located in kdebase/kwin/*, which implements the actual functionality. -- The decoration plugins, located in kdebase/kwin/clients and kdeartwork/kwin-styles, which +- The KWin core, located in kdebase/twin/*, which implements the actual functionality. +- The decoration plugins, located in kdebase/twin/clients and kdeartwork/twin-styles, which are responsible for the visual representation of the windows. -- The libkdecoration library, located in kdebase/kwin/lib/*, which is used for communication +- The libkdecoration library, located in kdebase/twin/lib/*, which is used for communication between the core and the decoration, and also implements some shared functionality for the decorations. -- KControl modules, located in kdebase/kwin/kcmkwin. +- KControl modules, located in kdebase/twin/kcmtwin. KWin decorations: ================= If you want to develop a decoration plugin for KWin, a HOWTO is available at -http://www.usermode.org/docs/kwintheme.html . It is currently not possible to create +http://www.usermode.org/docs/twintheme.html . It is currently not possible to create a new decoration without knowledge of C++, but it should be possible to write a themeable decoration (I'm not aware of any such decoration though). @@ -36,7 +36,7 @@ Restarting KWin: ================ Since KWin takes care of focus handling, first killing KWin and then launching new instance -can cause focus trouble. Therefore it's possible to run 'kwin --replace', which will start +can cause focus trouble. Therefore it's possible to run 'twin --replace', which will start new KWin instance and tell the old one to quit. @@ -46,7 +46,7 @@ Handling the case when KWin crashes: Again, without KWin running there may be focus problems. The simplest way to solve them is to add the 'Run Command' applet to Kicker - it can receive focus even without KWin running. If you can't add the applet or can reach it for some reason, switch to text console, and run -'DISPLAY=:0 kwin --replace' (and then you can run 'kwin --replace' again from X). +'DISPLAY=:0 twin --replace' (and then you can run 'twin --replace' again from X). If KWin is temporarily unusable because of some change and e.g. crashes during startup, it is possible to run another window manager, for example Metacity, OpenBox or FVWM (the command @@ -58,7 +58,7 @@ Debugging KWin: Focus problems once more. It is not possible to debug KWin in gdb in the X session that KWin is managing, because that'd block focus and window operations. It is necessary to switch to a text console -and attach to the running KWin instance from there, or launch it as 'DISPLAY=:0 gdb kwin'. +and attach to the running KWin instance from there, or launch it as 'DISPLAY=:0 gdb twin'. Since KWin is such an important component of KDE, it is usually better to start another X for development. Note that XNest is quite buggy and is therefore not recommended to use. @@ -101,7 +101,7 @@ The rest of the files contain additional helper classes: - group.* - grouping related windows together (warning! This is currently really messy and scary code that should be rewritten). - killwindow.* - handling of the Ctrl+Esc feature -- kwinbindings.cpp - KWin's keyboard shortcuts (used by kdebase/kcontrol/keys) +- twinbindings.cpp - KWin's keyboard shortcuts (used by kdebase/kcontrol/keys) - notifications.* - for KNotify - options.* - all configuration options for KWin are stored in this class - plugins.* - loading of the right decoration plugin @@ -123,7 +123,7 @@ code is wrapped in helper functions, and I can handle problems there ;) . Howeve features don't require touching X/Xlib directly, still X/Xlib may impose their semantics on the way things are done. When in doubt, simply ask. -All patches for KWin core should be sent to kwin@kde.org for review first. Even seemingly harmless +All patches for KWin core should be sent to twin@kde.org for review first. Even seemingly harmless changes may have extensive consequences. Various notes: @@ -133,7 +133,7 @@ in class Client and it will print information about the window. - KWin itself cannot create any normal windows, because it would have trouble managing its own windows. For such cases (which should be rare) a small external helper application is needed (kdialog should often -do, and for special cases such a utility needs to be written like kwin/killer). +do, and for special cases such a utility needs to be written like twin/killer). X documentation: @@ -171,4 +171,4 @@ right before sending the patch). I don't care where you do and don't put spaces variables, as long as I can read it (trying to make it look like the rest of the code is bonus points though ;) ). -kwin@kde.org +twin@kde.org diff --git a/kwin/Makefile.am b/kwin/Makefile.am index d7bc669e9..02e560d30 100644 --- a/kwin/Makefile.am +++ b/kwin/Makefile.am @@ -4,35 +4,35 @@ if include_kompmgr KOMPMGR=kompmgr endif -SUBDIRS = lib . killer kcmkwin pics clients oldheaders data $(KOMPMGR) +SUBDIRS = lib . killer kcmtwin pics clients oldheaders data $(KOMPMGR) bin_PROGRAMS = lib_LTLIBRARIES = -tdeinit_LTLIBRARIES = kwin.la +tdeinit_LTLIBRARIES = twin.la -kwin_la_SOURCES = workspace.cpp client.cpp placement.cpp atoms.cpp \ +twin_la_SOURCES = workspace.cpp client.cpp placement.cpp atoms.cpp \ utils.cpp layers.cpp main.cpp popupinfo.cpp tabbox.cpp \ options.cpp plugins.cpp events.cpp KWinInterface.skel \ killwindow.cpp geometrytip.cpp sm.cpp group.cpp bridge.cpp \ manage.cpp notifications.cpp activation.cpp useractions.cpp \ geometry.cpp rules.cpp -kwin_la_LIBADD = $(LIB_TDEUI) lib/libtdecorations.la -kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version +twin_la_LIBADD = $(LIB_TDEUI) lib/libtdecorations.la +twin_la_LDFLAGS = $(all_libraries) -module -avoid-version include_HEADERS = KWinInterface.h -KDE_ICON = kwin +KDE_ICON = twin METASOURCES = AUTO messages: rc.cpp - $(XGETTEXT) -kaliasLocal *.h *.cpp killer/*.cpp lib/*.cpp -o $(podir)/kwin.pot + $(XGETTEXT) -kaliasLocal *.h *.cpp killer/*.cpp lib/*.cpp -o $(podir)/twin.pot -kwin_datadir = $(kde_datadir)/kwin +twin_datadir = $(kde_datadir)/twin -kwin_data_DATA= eventsrc +twin_data_DATA= eventsrc -kde_kcfg_DATA = kwin.kcfg +kde_kcfg_DATA = twin.kcfg include ../admin/Doxyfile.am diff --git a/kwin/README b/kwin/README index 52a26e079..7677b2b78 100644 --- a/kwin/README +++ b/kwin/README @@ -1,4 +1,4 @@ -- The mailing list for KWin is kwin@kde.org (https://mail.kde.org/mailman/listinfo/kwin). +- The mailing list for KWin is twin@kde.org (https://mail.kde.org/mailman/listinfo/twin). - If you want to develop KWin, see file HACKING. @@ -23,7 +23,7 @@ background knowledge (since sometimes it's difficult even for people who do have the knowledge), the mechanisms are first briefly explained, and then an example of fixing the various problems is given. - For comments, questions, suggestions and whatever use the kwin@kde.org + For comments, questions, suggestions and whatever use the twin@kde.org mailing list. diff --git a/kwin/activation.cpp b/kwin/activation.cpp index 544569a2d..d0212def2 100644 --- a/kwin/activation.cpp +++ b/kwin/activation.cpp @@ -609,7 +609,7 @@ bool Workspace::allowFullClientRaising( const Client* c, Time time ) void Workspace::restoreFocus() { // this updateXTime() is necessary - as FocusIn events don't have - // a timestamp *sigh*, kwin's timestamp would be older than the timestamp + // a timestamp *sigh*, twin's timestamp would be older than the timestamp // that was used by whoever caused the focus change, and therefore // the attempt to restore the focus would fail due to old timestamp updateXTime(); @@ -663,7 +663,7 @@ void Workspace::unfakeActivity( Client* c ) /*! Updates the user time (time of last action in the active window). - This is called inside kwin for every action with the window + This is called inside twin for every action with the window that qualifies for user interaction (clicking on it, activate it externally, etc.). */ diff --git a/kwin/atoms.cpp b/kwin/atoms.cpp index 165a9e72c..aa6e82ea2 100644 --- a/kwin/atoms.cpp +++ b/kwin/atoms.cpp @@ -26,7 +26,7 @@ Atoms::Atoms() Atom atoms_return[max]; int n = 0; - atoms[n] = &kwin_running; + atoms[n] = &twin_running; names[n++] = (char *) "KWIN_RUNNING"; atoms[n] = &wm_protocols; diff --git a/kwin/atoms.h b/kwin/atoms.h index ca9e063af..46dd11f9b 100644 --- a/kwin/atoms.h +++ b/kwin/atoms.h @@ -21,7 +21,7 @@ class Atoms public: Atoms(); - Atom kwin_running; + Atom twin_running; Atom wm_protocols; Atom wm_delete_window; diff --git a/kwin/client.cpp b/kwin/client.cpp index f7c2dad5e..fbd2d75aa 100644 --- a/kwin/client.cpp +++ b/kwin/client.cpp @@ -21,7 +21,7 @@ License. See the file "COPYING" for the exact licensing terms. #include <unistd.h> #include <kstandarddirs.h> #include <tqwhatsthis.h> -#include <kwin.h> +#include <twin.h> #include <kiconloader.h> #include <stdlib.h> @@ -1817,7 +1817,7 @@ void Client::killProcess( bool ask, Time timestamp ) else { // SELI TODO handle the window created by handler specially (on top,urgent?) process_killer = new KProcess( this ); - *process_killer << KStandardDirs::findExe( "kwin_killer_helper" ) + *process_killer << KStandardDirs::findExe( "twin_killer_helper" ) << "--pid" << TQCString().setNum( pid ) << "--hostname" << machine << "--windowname" << caption().utf8() << "--applicationname" << resourceClass() @@ -2832,7 +2832,7 @@ kdbgstream& operator<<( kdbgstream& stream, const ConstClientList& list ) } #endif -TQPixmap * kwin_get_menu_pix_hack() +TQPixmap * twin_get_menu_pix_hack() { static TQPixmap p; if ( p.isNull() ) diff --git a/kwin/clients/Makefile.am b/kwin/clients/Makefile.am index 6d00b0001..c62b21019 100644 --- a/kwin/clients/Makefile.am +++ b/kwin/clients/Makefile.am @@ -4,5 +4,5 @@ SUBDIRS = plastik b2 default keramik laptop modernsystem quartz redmond web messages: rc.cpp $(EXTRACTRC) `find . -name \*.ui` >> rc.cpp - $(XGETTEXT) `find . -name \*.cpp` -o $(podir)/kwin_clients.pot + $(XGETTEXT) `find . -name \*.cpp` -o $(podir)/twin_clients.pot -rm rc.cpp diff --git a/kwin/clients/PORTING b/kwin/clients/PORTING index f6233beb9..b5fc6500f 100644 --- a/kwin/clients/PORTING +++ b/kwin/clients/PORTING @@ -2,16 +2,16 @@ 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 kwin_ to kwin3_ (in LDFLAGS, LIBADD, kde_module_LTLIBRARIES, SOURCES). +- 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)/kwin/ ). +- Do NOT rename the directory where the .desktop file is installed ( $(kde_datadir)/twin/ ). .desktop file: -- Change kwin_ to kwin3_ in X-KDE-Library. +- Change twin_ to twin3_ in X-KDE-Library. Sources: -- There are no kwin/something.h includes, and don't use the KWinInternal namespace. +- There are no twin/something.h includes, and don't use the KWinInternal namespace. - Use QToolTip instead of KWinToolTip. - Use QButton instead of KWinButton, QToolButton instead of KWinToolButton and QWidget instead of KWinWidgetButton. @@ -154,6 +154,6 @@ extern "C" - Review mousePosition() if it's implemented. Position constants need 'Position' prepended, e.g. Top -> PositionTop. - Note that you cannot use "appdata" with KStandardDirs, as the decoration will be used - also in other applications than kwin. + also in other applications than twin. - Implement all missing pure virtual functions. For mousePosition(), you may call KDecoration::mousePosition() if it's sufficient. diff --git a/kwin/clients/b2/CMakeLists.txt b/kwin/clients/b2/CMakeLists.txt index 2395ecc84..c7f4bdb9d 100644 --- a/kwin/clients/b2/CMakeLists.txt +++ b/kwin/clients/b2/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 b2.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) +install( FILES b2.desktop DESTINATION ${DATA_INSTALL_DIR}/twin ) -##### kwin3_b2 (module) ######################### +##### twin3_b2 (module) ######################### -tde_add_kpart( kwin3_b2 AUTOMOC +tde_add_kpart( twin3_b2 AUTOMOC SOURCES b2client.cpp LINK tdecorations-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/kwin/clients/b2/Makefile.am b/kwin/clients/b2/Makefile.am index 32e68eeea..ccd7f39fa 100644 --- a/kwin/clients/b2/Makefile.am +++ b/kwin/clients/b2/Makefile.am @@ -3,17 +3,17 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes) SUBDIRS = . config -kde_module_LTLIBRARIES = kwin3_b2.la +kde_module_LTLIBRARIES = twin3_b2.la -kwin3_b2_la_SOURCES = b2client.cpp -kwin3_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -# kwin_b2_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) -kwin3_b2_la_LIBADD = ../../lib/libtdecorations.la +twin3_b2_la_SOURCES = b2client.cpp +twin3_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 METASOURCES = AUTO noinst_HEADERS = b2client.h -lnkdir = $(kde_datadir)/kwin/ +lnkdir = $(kde_datadir)/twin/ lnk_DATA = b2.desktop EXTRA_DIST = $(lnk_DATA) diff --git a/kwin/clients/b2/b2.desktop b/kwin/clients/b2/b2.desktop index c368d7fa7..3a1fa3b4a 100644 --- a/kwin/clients/b2/b2.desktop +++ b/kwin/clients/b2/b2.desktop @@ -4,4 +4,4 @@ Name[hi]=बी II Name[lo]= B II Name[te]=బి II Name[th]=ชุดตกแต่ง B II -X-KDE-Library=kwin3_b2 +X-KDE-Library=twin3_b2 diff --git a/kwin/clients/b2/b2client.cpp b/kwin/clients/b2/b2client.cpp index 179eee0eb..c5786146a 100644 --- a/kwin/clients/b2/b2client.cpp +++ b/kwin/clients/b2/b2client.cpp @@ -103,7 +103,7 @@ static void read_config(B2ClientFactory *f) buttonSize = (TQFontMetrics(options()->font(true)).height() + 1) & 0x3e; if (buttonSize < 16) buttonSize = 16; - KConfig conf("kwinb2rc"); + KConfig conf("twinb2rc"); conf.setGroup("General"); colored_frame = conf.readBoolEntry("UseTitleBarBorderColors", false); do_draw_handle = conf.readBoolEntry("DrawGrabHandle", true); @@ -167,7 +167,7 @@ static void drawB2Rect(KPixmap *pix, const TQColor &primary, bool down) } -TQPixmap* kwin_get_menu_pix_hack() +TQPixmap* twin_get_menu_pix_hack() { //return menu_pix; FIXME return PIXMAP_A(P_MENU); diff --git a/kwin/clients/b2/config/CMakeLists.txt b/kwin/clients/b2/config/CMakeLists.txt index f319ac8f6..0785fb176 100644 --- a/kwin/clients/b2/config/CMakeLists.txt +++ b/kwin/clients/b2/config/CMakeLists.txt @@ -20,9 +20,9 @@ link_directories( ) -##### kwin_b2_config (module) ################### +##### twin_b2_config (module) ################### -tde_add_kpart( kwin_b2_config AUTOMOC +tde_add_kpart( twin_b2_config AUTOMOC SOURCES config.cpp LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/kwin/clients/b2/config/Makefile.am b/kwin/clients/b2/config/Makefile.am index 0a508a3c1..4319b5375 100644 --- a/kwin/clients/b2/config/Makefile.am +++ b/kwin/clients/b2/config/Makefile.am @@ -1,15 +1,15 @@ INCLUDES = $(all_includes) -kde_module_LTLIBRARIES = kwin_b2_config.la +kde_module_LTLIBRARIES = twin_b2_config.la -kwin_b2_config_la_SOURCES = config.cpp -kwin_b2_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin_b2_config_la_LIBADD = $(LIB_TDEUI) +twin_b2_config_la_SOURCES = config.cpp +twin_b2_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_b2_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/b2/config/config.cpp b/kwin/clients/b2/config/config.cpp index ca1dccc65..956f55bb4 100644 --- a/kwin/clients/b2/config/config.cpp +++ b/kwin/clients/b2/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 */ B2Config::B2Config( KConfig* conf, TQWidget* parent ) : TQObject( parent ) { - KGlobal::locale()->insertCatalogue("kwin_b2_config"); - b2Config = new KConfig("kwinb2rc"); + KGlobal::locale()->insertCatalogue("twin_b2_config"); + b2Config = new KConfig("twinb2rc"); gb = new TQVBox(parent); cbColorBorder = new TQCheckBox( @@ -76,7 +76,7 @@ B2Config::B2Config( KConfig* conf, TQWidget* parent ) this, TQT_SLOT(slotSelectionChanged())); connect(menuDblClickOp, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSelectionChanged())); - // Make the widgets visible in kwindecoration + // Make the widgets visible in twindecoration gb->show(); } @@ -94,8 +94,8 @@ void B2Config::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 B2Config::load(KConfig * /*conf*/) { b2Config->setGroup("General"); @@ -140,7 +140,7 @@ static TQString opToString(int op) } -// Saves the configurable options to the kwinrc config file +// Saves the configurable options to the twinrc config file void B2Config::save(KConfig * /*conf*/) { b2Config->setGroup("General"); diff --git a/kwin/clients/default/CMakeLists.txt b/kwin/clients/default/CMakeLists.txt index 5ad3d2def..142a9b783 100644 --- a/kwin/clients/default/CMakeLists.txt +++ b/kwin/clients/default/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} ) @@ -23,9 +23,9 @@ link_directories( ) -##### kwin3_default (module) #################### +##### twin3_default (module) #################### -tde_add_kpart( kwin3_default AUTOMOC +tde_add_kpart( twin3_default AUTOMOC SOURCES kdedefault.cpp LINK tdecorations-shared tdecore-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/kwin/clients/default/Makefile.am b/kwin/clients/default/Makefile.am index 331f87822..3e687a2a6 100644 --- a/kwin/clients/default/Makefile.am +++ b/kwin/clients/default/Makefile.am @@ -3,11 +3,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes) SUBDIRS = . config -kde_module_LTLIBRARIES = kwin3_default.la +kde_module_LTLIBRARIES = twin3_default.la -kwin3_default_la_SOURCES = kdedefault.cpp -kwin3_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin3_default_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.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 METASOURCES = AUTO noinst_HEADERS = kdedefault.h diff --git a/kwin/clients/default/config/CMakeLists.txt b/kwin/clients/default/config/CMakeLists.txt index 4f6c76835..5814e011f 100644 --- a/kwin/clients/default/config/CMakeLists.txt +++ b/kwin/clients/default/config/CMakeLists.txt @@ -20,9 +20,9 @@ link_directories( ) -##### kwin_default_config (module) ############## +##### twin_default_config (module) ############## -tde_add_kpart( kwin_default_config AUTOMOC +tde_add_kpart( twin_default_config AUTOMOC SOURCES config.cpp LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/kwin/clients/default/config/Makefile.am b/kwin/clients/default/config/Makefile.am index 0c6084226..3a1df8aa2 100644 --- a/kwin/clients/default/config/Makefile.am +++ b/kwin/clients/default/config/Makefile.am @@ -1,15 +1,15 @@ INCLUDES = $(all_includes) -kde_module_LTLIBRARIES = kwin_default_config.la +kde_module_LTLIBRARIES = twin_default_config.la -kwin_default_config_la_SOURCES = config.cpp -kwin_default_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin_default_config_la_LIBADD = $(LIB_TDEUI) +twin_default_config_la_SOURCES = config.cpp +twin_default_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_default_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/default/config/config.cpp b/kwin/clients/default/config/config.cpp index c98fb1366..eac4ef4e4 100644 --- a/kwin/clients/default/config/config.cpp +++ b/kwin/clients/default/config/config.cpp @@ -24,15 +24,15 @@ 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 KDEDefaultConfig::KDEDefaultConfig( KConfig* conf, TQWidget* parent ) : TQObject( parent ) { - KGlobal::locale()->insertCatalogue("kwin_clients"); + KGlobal::locale()->insertCatalogue("twin_clients"); highcolor = TQPixmap::defaultDepth() > 8; gb = new TQVBox( parent ); gb->setSpacing( KDialog::spacingHint() ); @@ -69,7 +69,7 @@ KDEDefaultConfig::KDEDefaultConfig( KConfig* conf, TQWidget* parent ) connect( cbUseGradients, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()) ); - // Make the widgets visible in kwindecoration + // Make the widgets visible in twindecoration gb->show(); } @@ -86,8 +86,8 @@ void KDEDefaultConfig::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 KDEDefaultConfig::load( KConfig* conf ) { conf->setGroup("KDEDefault"); @@ -104,7 +104,7 @@ void KDEDefaultConfig::load( KConfig* conf ) } -// Saves the configurable options to the kwinrc config file +// Saves the configurable options to the twinrc config file void KDEDefaultConfig::save( KConfig* conf ) { conf->setGroup("KDEDefault"); @@ -113,7 +113,7 @@ void KDEDefaultConfig::save( KConfig* conf ) if (highcolor) conf->writeEntry( "UseGradients", cbUseGradients->isChecked() ); - // No need to conf->sync() - kwindecoration will do it for us + // No need to conf->sync() - twindecoration will do it for us } diff --git a/kwin/clients/keramik/CMakeLists.txt b/kwin/clients/keramik/CMakeLists.txt index e4da85e84..67e739d48 100644 --- a/kwin/clients/keramik/CMakeLists.txt +++ b/kwin/clients/keramik/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,15 +25,15 @@ link_directories( ##### other data ################################ -install( FILES keramik.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) +install( FILES keramik.desktop DESTINATION ${DATA_INSTALL_DIR}/twin ) -##### kwin3_keramik (module) #################### +##### twin3_keramik (module) #################### set_source_files_properties( keramik.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tiles.h ) -tde_add_kpart( kwin3_keramik AUTOMOC +tde_add_kpart( twin3_keramik AUTOMOC SOURCES keramik.cpp LINK tdecorations-shared tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/kwin/clients/keramik/Makefile.am b/kwin/clients/keramik/Makefile.am index 993c9d9ba..4c7c6e10c 100644 --- a/kwin/clients/keramik/Makefile.am +++ b/kwin/clients/keramik/Makefile.am @@ -10,18 +10,18 @@ embedtool_SOURCES = embedtool.cpp embedtool_LDADD = $(LIB_QT) embedtool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -kde_module_LTLIBRARIES = kwin3_keramik.la +kde_module_LTLIBRARIES = twin3_keramik.la -kwin3_keramik_la_SOURCES = keramik.cpp -kwin3_keramik_la_COMPILE_FIRST = tiles.h -kwin3_keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin3_keramik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la -#kwin3_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) +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) METASOURCES = AUTO noinst_headers = keramik.h tiles.h -lnkdir = $(kde_datadir)/kwin +lnkdir = $(kde_datadir)/twin lnk_DATA = keramik.desktop EXTRA_DIST = $(lnk_DATA) diff --git a/kwin/clients/keramik/config/CMakeLists.txt b/kwin/clients/keramik/config/CMakeLists.txt index febfa0d44..7b5bdb339 100644 --- a/kwin/clients/keramik/config/CMakeLists.txt +++ b/kwin/clients/keramik/config/CMakeLists.txt @@ -20,9 +20,9 @@ link_directories( ) -##### kwin_keramik_config (module) ############## +##### twin_keramik_config (module) ############## -tde_add_kpart( kwin_keramik_config AUTOMOC +tde_add_kpart( twin_keramik_config AUTOMOC SOURCES config.cpp keramikconfig.ui LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/kwin/clients/keramik/config/Makefile.am b/kwin/clients/keramik/config/Makefile.am index d4ffce144..19ee4f27d 100644 --- a/kwin/clients/keramik/config/Makefile.am +++ b/kwin/clients/keramik/config/Makefile.am @@ -1,13 +1,13 @@ INCLUDES = $(all_includes) -kde_module_LTLIBRARIES = kwin_keramik_config.la +kde_module_LTLIBRARIES = twin_keramik_config.la -kwin_keramik_config_la_SOURCES = config.cpp keramikconfig.ui -kwin_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin_keramik_config_la_LIBADD = $(LIB_TDEUI) +twin_keramik_config_la_SOURCES = config.cpp keramikconfig.ui +twin_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_keramik_config_la_LIBADD = $(LIB_TDEUI) METASOURCES = AUTO noinst_HEADERS = config.h keramikconfig.h -lnkdir = $(kde_datadir)/kwin +lnkdir = $(kde_datadir)/twin diff --git a/kwin/clients/keramik/config/config.cpp b/kwin/clients/keramik/config/config.cpp index b4b6ced9b..1852eadd8 100644 --- a/kwin/clients/keramik/config/config.cpp +++ b/kwin/clients/keramik/config/config.cpp @@ -41,18 +41,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 */ KeramikConfig::KeramikConfig( KConfig* conf, TQWidget* parent ) : TQObject( parent ) { - KGlobal::locale()->insertCatalogue("kwin_clients"); - c = new KConfig( "kwinkeramikrc" ); + KGlobal::locale()->insertCatalogue("twin_clients"); + c = new KConfig( "twinkeramikrc" ); ui = new KeramikConfigUI( parent ); connect( ui->showAppIcons, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) ); @@ -72,8 +72,8 @@ KeramikConfig::~KeramikConfig() } -// 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 KeramikConfig::load( KConfig* ) { c->setGroup("General"); @@ -84,7 +84,7 @@ void KeramikConfig::load( KConfig* ) } -// Saves the configurable options to the kwinrc config file +// Saves the configurable options to the twinrc config file void KeramikConfig::save( KConfig* ) { c->setGroup( "General" ); diff --git a/kwin/clients/keramik/keramik.cpp b/kwin/clients/keramik/keramik.cpp index 5edf98230..e514e3a20 100644 --- a/kwin/clients/keramik/keramik.cpp +++ b/kwin/clients/keramik/keramik.cpp @@ -562,7 +562,7 @@ void KeramikHandler::pretile( TQPixmap *&pix, int size, Qt::Orientation dir ) void KeramikHandler::readConfig() { - KConfig *c = new KConfig( "kwinkeramikrc" ); + KConfig *c = new KConfig( "twinkeramikrc" ); c->setGroup( "General" ); showIcons = c->readBoolEntry( "ShowAppIcons", true ); diff --git a/kwin/clients/keramik/keramik.desktop b/kwin/clients/keramik/keramik.desktop index c58f8d522..7ef21f47d 100644 --- a/kwin/clients/keramik/keramik.desktop +++ b/kwin/clients/keramik/keramik.desktop @@ -27,5 +27,5 @@ Name[uk]=Керамік Name[uz]=Keramika Name[uz@cyrillic]=Керамика Name[vi]=Gốm -X-KDE-Library=kwin3_keramik +X-KDE-Library=twin3_keramik diff --git a/kwin/clients/kwmtheme/Makefile.am b/kwin/clients/kwmtheme/Makefile.am index a3a91080a..e9d3c36b8 100644 --- a/kwin/clients/kwmtheme/Makefile.am +++ b/kwin/clients/kwmtheme/Makefile.am @@ -1,15 +1,15 @@ SUBDIRS=cli_installer INCLUDES = $(all_includes) -kde_module_LTLIBRARIES = kwin3_kwmtheme.la +kde_module_LTLIBRARIES = twin3_kwmtheme.la -kwin3_kwmtheme_la_SOURCES = kwmthemeclient.cpp -kwin3_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin3_kwmtheme_la_LIBADD = -ltdecorations +twin3_kwmtheme_la_SOURCES = kwmthemeclient.cpp +twin3_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin3_kwmtheme_la_LIBADD = -ltdecorations METASOURCES = AUTO noinst_HEADERS = kwmthemeclient.h -lnkdir = $(kde_datadir)/kwin +lnkdir = $(kde_datadir)/twin lnk_DATA = kwmtheme.desktop diff --git a/kwin/clients/kwmtheme/cli_installer/main.cpp b/kwin/clients/kwmtheme/cli_installer/main.cpp index 56de8c9fe..4533cf3e8 100644 --- a/kwin/clients/kwmtheme/cli_installer/main.cpp +++ b/kwin/clients/kwmtheme/cli_installer/main.cpp @@ -57,10 +57,10 @@ int main(int argc, char **argv) return(2); } - TQStringList appDirs = KGlobal::dirs()->findDirs("data", "kwin"); + TQStringList appDirs = KGlobal::dirs()->findDirs("data", "twin"); TQString localDirStr = *(appDirs.end()); if(localDirStr.isEmpty()){ - localDirStr = KGlobal::dirs()->saveLocation("data", "kwin"); + localDirStr = KGlobal::dirs()->saveLocation("data", "twin"); } localDirStr += "/pics/"; if(!TQFile::exists(localDirStr)) diff --git a/kwin/clients/kwmtheme/kwmtheme.desktop b/kwin/clients/kwmtheme/kwmtheme.desktop index caa8a6ea8..b34affaa7 100644 --- a/kwin/clients/kwmtheme/kwmtheme.desktop +++ b/kwin/clients/kwmtheme/kwmtheme.desktop @@ -78,4 +78,4 @@ Name[xh]=Umxholo we KWM Name[zh_CN]=KWM 主题 Name[zh_TW]=KWM 主題 Name[zu]=Ingqikithi ye-KWM -X-KDE-Library=kwin3_kwmtheme +X-KDE-Library=twin3_kwmtheme diff --git a/kwin/clients/kwmtheme/kwmthemeclient.cpp b/kwin/clients/kwmtheme/kwmthemeclient.cpp index 9f51c0edf..5d5e462f7 100644 --- a/kwin/clients/kwmtheme/kwmthemeclient.cpp +++ b/kwin/clients/kwmtheme/kwmthemeclient.cpp @@ -90,7 +90,7 @@ static void create_pixmaps() for(int i=0; i < 8; ++i) { framePixmaps[i] = new TQPixmap(locate("data", - "kwin/pics/"+config->readEntry(keys[i], " "))); + "twin/pics/"+config->readEntry(keys[i], " "))); if(framePixmaps[i]->isNull()) kdWarning() << "Unable to load frame pixmap for " << keys[i] << endl; } @@ -111,33 +111,33 @@ static void create_pixmaps() maxExtent++; menuPix = new TQPixmap(locate("data", - "kwin/pics/"+config->readEntry("menu", " "))); + "twin/pics/"+config->readEntry("menu", " "))); iconifyPix = new TQPixmap(locate("data", - "kwin/pics/"+config->readEntry("iconify", " "))); + "twin/pics/"+config->readEntry("iconify", " "))); maxPix = new TQPixmap(locate("appdata", "pics/"+config->readEntry("maximize", " "))); minmaxPix = new TQPixmap(locate("data", - "kwin/pics/"+config->readEntry("maximizedown", " "))); + "twin/pics/"+config->readEntry("maximizedown", " "))); closePix = new TQPixmap(locate("data", - "kwin/pics/"+config->readEntry("close", " "))); + "twin/pics/"+config->readEntry("close", " "))); pinupPix = new TQPixmap(locate("data", - "kwin/pics/"+config->readEntry("pinup", " "))); + "twin/pics/"+config->readEntry("pinup", " "))); pindownPix = new TQPixmap(locate("data", - "kwin/pics/"+config->readEntry("pindown", " "))); + "twin/pics/"+config->readEntry("pindown", " "))); if(menuPix->isNull()) - menuPix->load(locate("data", "kwin/pics/menu.png")); + menuPix->load(locate("data", "twin/pics/menu.png")); if(iconifyPix->isNull()) - iconifyPix->load(locate("data", "kwin/pics/iconify.png")); + iconifyPix->load(locate("data", "twin/pics/iconify.png")); if(maxPix->isNull()) - maxPix->load(locate("data", "kwin/pics/maximize.png")); + maxPix->load(locate("data", "twin/pics/maximize.png")); if(minmaxPix->isNull()) - minmaxPix->load(locate("data", "kwin/pics/maximizedown.png")); + minmaxPix->load(locate("data", "twin/pics/maximizedown.png")); if(closePix->isNull()) - closePix->load(locate("data", "kwin/pics/close.png")); + closePix->load(locate("data", "twin/pics/close.png")); if(pinupPix->isNull()) - pinupPix->load(locate("data", "kwin/pics/pinup.png")); + pinupPix->load(locate("data", "twin/pics/pinup.png")); if(pindownPix->isNull()) - pindownPix->load(locate("data", "kwin/pics/pindown.png")); + pindownPix->load(locate("data", "twin/pics/pindown.png")); tmpStr = config->readEntry("TitleAlignment"); if(tmpStr == "right") @@ -186,14 +186,14 @@ static void create_pixmaps() tmpStr = config->readEntry("TitlebarPixmapActive", ""); if(!tmpStr.isEmpty()){ aTitlePix = new KPixmap; - aTitlePix->load(locate("data", "kwin/pics/" + tmpStr)); + aTitlePix->load(locate("data", "twin/pics/" + tmpStr)); } else aTitlePix = NULL; tmpStr = config->readEntry("TitlebarPixmapInactive", ""); if(!tmpStr.isEmpty()){ iTitlePix = new KPixmap; - iTitlePix->load(locate("data", "kwin/pics/" + tmpStr)); + iTitlePix->load(locate("data", "twin/pics/" + tmpStr)); } else iTitlePix = NULL; diff --git a/kwin/clients/laptop/CMakeLists.txt b/kwin/clients/laptop/CMakeLists.txt index e4ae404c5..a06afdafc 100644 --- a/kwin/clients/laptop/CMakeLists.txt +++ b/kwin/clients/laptop/CMakeLists.txt @@ -11,7 +11,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kwin/lib + ${CMAKE_SOURCE_DIR}/twin/lib ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -23,12 +23,12 @@ link_directories( ##### other data ################################ -install( FILES laptop.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) +install( FILES laptop.desktop DESTINATION ${DATA_INSTALL_DIR}/twin ) -##### kwin3_laptop (module) ##################### +##### twin3_laptop (module) ##################### -tde_add_kpart( kwin3_laptop AUTOMOC +tde_add_kpart( twin3_laptop AUTOMOC SOURCES laptopclient.cpp LINK tdecorations-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/kwin/clients/laptop/Makefile.am b/kwin/clients/laptop/Makefile.am index cc21c569a..ccf1d359b 100644 --- a/kwin/clients/laptop/Makefile.am +++ b/kwin/clients/laptop/Makefile.am @@ -1,16 +1,16 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes) -kde_module_LTLIBRARIES = kwin3_laptop.la +kde_module_LTLIBRARIES = twin3_laptop.la -kwin3_laptop_la_SOURCES = laptopclient.cpp -kwin3_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin3_laptop_la_LIBADD = ../../lib/libtdecorations.la +twin3_laptop_la_SOURCES = laptopclient.cpp +twin3_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin3_laptop_la_LIBADD = ../../lib/libtdecorations.la METASOURCES = AUTO noinst_HEADERS = laptopclient.h -lnkdir = $(kde_datadir)/kwin +lnkdir = $(kde_datadir)/twin lnk_DATA = laptop.desktop EXTRA_DIST = $(lnk_DATA) diff --git a/kwin/clients/laptop/laptop.desktop b/kwin/clients/laptop/laptop.desktop index 38c5386f1..640637546 100644 --- a/kwin/clients/laptop/laptop.desktop +++ b/kwin/clients/laptop/laptop.desktop @@ -66,4 +66,4 @@ Name[xh]=Umphezulu osongiweyo Name[zh_CN]=笔记本电脑 Name[zh_TW]=筆記型電腦 Name[zu]=Ikhomputha ephathwayo eyisicaba -X-KDE-Library=kwin3_laptop +X-KDE-Library=twin3_laptop diff --git a/kwin/clients/modernsystem/CMakeLists.txt b/kwin/clients/modernsystem/CMakeLists.txt index 723ddffe1..62c2d766c 100644 --- a/kwin/clients/modernsystem/CMakeLists.txt +++ b/kwin/clients/modernsystem/CMakeLists.txt @@ -12,7 +12,7 @@ add_subdirectory( config ) include_directories( - ${CMAKE_SOURCE_DIR}/kwin/lib + ${CMAKE_SOURCE_DIR}/twin/lib ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -24,12 +24,12 @@ link_directories( ##### other data ################################ -install( FILES modernsystem.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) +install( FILES modernsystem.desktop DESTINATION ${DATA_INSTALL_DIR}/twin ) -##### kwin3_modernsys (module) ################## +##### twin3_modernsys (module) ################## -tde_add_kpart( kwin3_modernsys +tde_add_kpart( twin3_modernsys SOURCES modernsys.cpp LINK tdecorations-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/kwin/clients/modernsystem/Makefile.am b/kwin/clients/modernsystem/Makefile.am index 7850663ba..e4c21d7a3 100644 --- a/kwin/clients/modernsystem/Makefile.am +++ b/kwin/clients/modernsystem/Makefile.am @@ -3,16 +3,16 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes) SUBDIRS = config -kde_module_LTLIBRARIES = kwin3_modernsys.la +kde_module_LTLIBRARIES = twin3_modernsys.la -kwin3_modernsys_la_SOURCES = modernsys.cpp -kwin3_modernsys_la_LIBADD = ../../lib/libtdecorations.la -kwin3_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin3_modernsys_la_SOURCES = modernsys.cpp +twin3_modernsys_la_LIBADD = ../../lib/libtdecorations.la +twin3_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module METASOURCES = AUTO noinst_HEADERS = modernsys.h -lnkdir = $(kde_datadir)/kwin/ +lnkdir = $(kde_datadir)/twin/ lnk_DATA = modernsystem.desktop EXTRA_DIST = $(lnk_DATA) diff --git a/kwin/clients/modernsystem/config/CMakeLists.txt b/kwin/clients/modernsystem/config/CMakeLists.txt index e2468db33..8a6d6db43 100644 --- a/kwin/clients/modernsystem/config/CMakeLists.txt +++ b/kwin/clients/modernsystem/config/CMakeLists.txt @@ -20,9 +20,9 @@ link_directories( ) -##### kwin_modernsys_config (module) ############ +##### twin_modernsys_config (module) ############ -tde_add_kpart( kwin_modernsys_config AUTOMOC +tde_add_kpart( twin_modernsys_config AUTOMOC SOURCES config.cpp LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/kwin/clients/modernsystem/config/Makefile.am b/kwin/clients/modernsystem/config/Makefile.am index 55a695684..aaae38b2a 100644 --- a/kwin/clients/modernsystem/config/Makefile.am +++ b/kwin/clients/modernsystem/config/Makefile.am @@ -1,14 +1,14 @@ INCLUDES = $(all_includes) -kde_module_LTLIBRARIES = kwin_modernsys_config.la +kde_module_LTLIBRARIES = twin_modernsys_config.la -kwin_modernsys_config_la_SOURCES = config.cpp -kwin_modernsys_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin_modernsys_config_la_LIBADD = $(LIB_TDEUI) +twin_modernsys_config_la_SOURCES = config.cpp +twin_modernsys_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_modernsys_config_la_LIBADD = $(LIB_TDEUI) METASOURCES = AUTO noinst_HEADERS = config.h -lnkdir = $(kde_datadir)/kwin/ +lnkdir = $(kde_datadir)/twin/ diff --git a/kwin/clients/modernsystem/config/config.cpp b/kwin/clients/modernsystem/config/config.cpp index f5260ba7d..136ff3492 100644 --- a/kwin/clients/modernsystem/config/config.cpp +++ b/kwin/clients/modernsystem/config/config.cpp @@ -19,16 +19,16 @@ extern "C" } -// '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 ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(parent) { - clientrc = new KConfig("kwinmodernsysrc"); - KGlobal::locale()->insertCatalogue("kwin_clients"); + clientrc = new KConfig("twinmodernsysrc"); + KGlobal::locale()->insertCatalogue("twin_clients"); mainw = new TQWidget(parent); vbox = new TQVBoxLayout(mainw); vbox->setSpacing(6); diff --git a/kwin/clients/modernsystem/modernsys.cpp b/kwin/clients/modernsystem/modernsys.cpp index 30344d75c..b6e7cda01 100644 --- a/kwin/clients/modernsystem/modernsys.cpp +++ b/kwin/clients/modernsystem/modernsys.cpp @@ -217,7 +217,7 @@ void ModernSysFactory::read_config() bool showh; int hsize, hwidth, bwidth, theight; - KConfig c("kwinmodernsysrc"); + KConfig c("twinmodernsysrc"); c.setGroup("General"); showh = c.readBoolEntry("ShowHandle", true); diff --git a/kwin/clients/modernsystem/modernsystem.desktop b/kwin/clients/modernsystem/modernsystem.desktop index d6247a390..994fd2860 100644 --- a/kwin/clients/modernsystem/modernsystem.desktop +++ b/kwin/clients/modernsystem/modernsystem.desktop @@ -66,4 +66,4 @@ Name[vi]=Hệ thống Hiện đại Name[wa]=Sistinme modiene Name[zh_CN]=现代系统 Name[zh_TW]=現代系統 -X-KDE-Library=kwin3_modernsys +X-KDE-Library=twin3_modernsys diff --git a/kwin/clients/plastik/CMakeLists.txt b/kwin/clients/plastik/CMakeLists.txt index cc9aaa347..d782413ce 100644 --- a/kwin/clients/plastik/CMakeLists.txt +++ b/kwin/clients/plastik/CMakeLists.txt @@ -15,7 +15,7 @@ add_definitions( -DQT_PLUGIN ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kwin/lib + ${CMAKE_SOURCE_DIR}/twin/lib ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -27,12 +27,12 @@ link_directories( ##### other data ################################ -install( FILES plastik.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) +install( FILES plastik.desktop DESTINATION ${DATA_INSTALL_DIR}/twin ) -##### kwin3_plastik (module) #################### +##### twin3_plastik (module) #################### -tde_add_kpart( kwin3_plastik AUTOMOC +tde_add_kpart( twin3_plastik AUTOMOC SOURCES plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp LINK tdecorations-shared tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/kwin/clients/plastik/Makefile.am b/kwin/clients/plastik/Makefile.am index cb3f5f447..c1757891d 100644 --- a/kwin/clients/plastik/Makefile.am +++ b/kwin/clients/plastik/Makefile.am @@ -6,14 +6,14 @@ KDE_CXXFLAGS = -DQT_PLUGIN INCLUDES = -I$(srcdir)/../../lib $(all_includes) -kwindir = $(kde_datadir)/kwin/ -kwin_DATA = plastik.desktop +twindir = $(kde_datadir)/twin/ +twin_DATA = plastik.desktop -kde_module_LTLIBRARIES = kwin3_plastik.la -kwin3_plastik_la_SOURCES = plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp -kwin3_plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin3_plastik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la -kwin3_plastik_la_METASOURCES = AUTO +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 -DISTCLEANFILES = $(kwin3_plastik_la_METASOURCES) +DISTCLEANFILES = $(twin3_plastik_la_METASOURCES) diff --git a/kwin/clients/plastik/config/CMakeLists.txt b/kwin/clients/plastik/config/CMakeLists.txt index 4e3c2ac2b..49066000e 100644 --- a/kwin/clients/plastik/config/CMakeLists.txt +++ b/kwin/clients/plastik/config/CMakeLists.txt @@ -24,9 +24,9 @@ link_directories( install( FILES DESTINATION ${XDG_APPS_INSTALL_DIR} ) -##### kwin_plastik_config (module) ############## +##### twin_plastik_config (module) ############## -tde_add_kpart( kwin_plastik_config AUTOMOC +tde_add_kpart( twin_plastik_config AUTOMOC SOURCES config.cpp configdialog.ui LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/kwin/clients/plastik/config/Makefile.am b/kwin/clients/plastik/config/Makefile.am index a7b50219b..b21a1d26b 100644 --- a/kwin/clients/plastik/config/Makefile.am +++ b/kwin/clients/plastik/config/Makefile.am @@ -1,14 +1,14 @@ INCLUDES = $(all_includes) -kde_module_LTLIBRARIES = kwin_plastik_config.la +kde_module_LTLIBRARIES = twin_plastik_config.la -kwin_plastik_config_la_SOURCES = config.cpp configdialog.ui -kwin_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin_plastik_config_la_LIBADD = $(LIB_TDEUI) +twin_plastik_config_la_SOURCES = config.cpp configdialog.ui +twin_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_plastik_config_la_LIBADD = $(LIB_TDEUI) METASOURCES = AUTO noinst_HEADERS = config.h DISTCLEANFILES = $(METASOURCES) -lnkdir = $(kde_datadir)/kwin +lnkdir = $(kde_datadir)/twin diff --git a/kwin/clients/plastik/config/config.cpp b/kwin/clients/plastik/config/config.cpp index 0352bff91..aa1c7bd0f 100644 --- a/kwin/clients/plastik/config/config.cpp +++ b/kwin/clients/plastik/config/config.cpp @@ -38,8 +38,8 @@ PlastikConfig::PlastikConfig(KConfig* config, TQWidget* parent) : TQObject(parent), m_config(0), m_dialog(0) { // create the configuration object - m_config = new KConfig("kwinplastikrc"); - KGlobal::locale()->insertCatalogue("kwin_clients"); + m_config = new KConfig("twinplastikrc"); + KGlobal::locale()->insertCatalogue("twin_clients"); // create and show the configuration dialog m_dialog = new ConfigDialog(parent); diff --git a/kwin/clients/plastik/plastik.cpp b/kwin/clients/plastik/plastik.cpp index 3f0ceab85..9faf73df0 100644 --- a/kwin/clients/plastik/plastik.cpp +++ b/kwin/clients/plastik/plastik.cpp @@ -162,7 +162,7 @@ bool PlastikHandler::supports( Ability ability ) void PlastikHandler::readConfig() { // create a config object - KConfig config("kwinplastikrc"); + KConfig config("twinplastikrc"); config.setGroup("General"); // grab settings diff --git a/kwin/clients/plastik/plastik.desktop b/kwin/clients/plastik/plastik.desktop index 55800ad9b..874719191 100644 --- a/kwin/clients/plastik/plastik.desktop +++ b/kwin/clients/plastik/plastik.desktop @@ -34,4 +34,4 @@ Name[uk]=Пластик Name[uz@cyrillic]=Пластик Name[vi]=Chất dẻo Name[zh_CN]=塑料 -X-KDE-Library=kwin3_plastik +X-KDE-Library=twin3_plastik diff --git a/kwin/clients/plastik/plastikbutton.cpp b/kwin/clients/plastik/plastikbutton.cpp index 795a384d2..5f81033cb 100644 --- a/kwin/clients/plastik/plastikbutton.cpp +++ b/kwin/clients/plastik/plastikbutton.cpp @@ -20,7 +20,7 @@ Boston, MA 02110-1301, USA. */ -// #include <kwin/options.h> +// #include <twin/options.h> #include <tqbitmap.h> #include <tqpainter.h> 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 diff --git a/kwin/clients/redmond/CMakeLists.txt b/kwin/clients/redmond/CMakeLists.txt index 5be11e2f9..b382af454 100644 --- a/kwin/clients/redmond/CMakeLists.txt +++ b/kwin/clients/redmond/CMakeLists.txt @@ -11,7 +11,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kwin/lib + ${CMAKE_SOURCE_DIR}/twin/lib ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -23,12 +23,12 @@ link_directories( ##### other data ################################ -install( FILES redmond.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) +install( FILES redmond.desktop DESTINATION ${DATA_INSTALL_DIR}/twin ) -##### kwin3_redmond (module) #################### +##### twin3_redmond (module) #################### -tde_add_kpart( kwin3_redmond AUTOMOC +tde_add_kpart( twin3_redmond AUTOMOC SOURCES redmond.cpp LINK tdecorations-shared tdecore-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/kwin/clients/redmond/Makefile.am b/kwin/clients/redmond/Makefile.am index 7580887b8..39985f347 100644 --- a/kwin/clients/redmond/Makefile.am +++ b/kwin/clients/redmond/Makefile.am @@ -1,16 +1,16 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes) -kde_module_LTLIBRARIES = kwin3_redmond.la +kde_module_LTLIBRARIES = twin3_redmond.la -kwin3_redmond_la_SOURCES = redmond.cpp -kwin3_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin3_redmond_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.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 METASOURCES = AUTO noinst_HEADERS = redmond.h -lnkdir = $(kde_datadir)/kwin +lnkdir = $(kde_datadir)/twin lnk_DATA = redmond.desktop EXTRA_DIST = $(lnk_DATA) diff --git a/kwin/clients/redmond/redmond.desktop b/kwin/clients/redmond/redmond.desktop index ae7628876..398a7f651 100644 --- a/kwin/clients/redmond/redmond.desktop +++ b/kwin/clients/redmond/redmond.desktop @@ -16,4 +16,4 @@ Name[te]=రెడ్ మండ్ Name[tg]=Райдмонд Name[th]=แบบเรดมอนด์ Name[uz@cyrillic]=Редмонд -X-KDE-Library=kwin3_redmond +X-KDE-Library=twin3_redmond diff --git a/kwin/clients/redmond/redmond.h b/kwin/clients/redmond/redmond.h index fdc5047bc..e5f15b8ba 100644 --- a/kwin/clients/redmond/redmond.h +++ b/kwin/clients/redmond/redmond.h @@ -3,7 +3,7 @@ * Redmond KWin client * * Copyright 2001-2003 - * Ported to kwin_iii by Chris Lee <clee@kde.org> + * Ported to twin_iii by Chris Lee <clee@kde.org> * Karol Szwed <gallium@kde.org> * http://gallium.n3.net/ * diff --git a/kwin/clients/test/Makefile.am b/kwin/clients/test/Makefile.am index b63377889..07ac72c02 100644 --- a/kwin/clients/test/Makefile.am +++ b/kwin/clients/test/Makefile.am @@ -1,15 +1,15 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes) -kde_module_LTLIBRARIES = kwin3_test.la +kde_module_LTLIBRARIES = twin3_test.la -kwin3_test_la_SOURCES = test.cpp -kwin3_test_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin3_test_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la -#kwin_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) +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_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) METASOURCES = AUTO -kwin_test_lnkdir = $(kde_datadir)/kwin -kwin_test_lnk_DATA = test.desktop +twin_test_lnkdir = $(kde_datadir)/twin +twin_test_lnk_DATA = test.desktop -EXTRA_DIST = $(kwin_test_lnk_DATA) +EXTRA_DIST = $(twin_test_lnk_DATA) diff --git a/kwin/clients/test/test.desktop b/kwin/clients/test/test.desktop index ed340f573..c6cd1e8fa 100644 --- a/kwin/clients/test/test.desktop +++ b/kwin/clients/test/test.desktop @@ -64,4 +64,4 @@ Name[vi]=Thử KWin Name[wa]=Saye KPurnea Name[zh_CN]=KWin 测试 Name[zh_TW]=KWin 測試 -X-KDE-Library=kwin3_test +X-KDE-Library=twin3_test diff --git a/kwin/clients/web/CMakeLists.txt b/kwin/clients/web/CMakeLists.txt index 6a6d1088d..badbd0467 100644 --- a/kwin/clients/web/CMakeLists.txt +++ b/kwin/clients/web/CMakeLists.txt @@ -22,12 +22,12 @@ link_directories( ##### other data ################################ -install( FILES web.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin ) +install( FILES web.desktop DESTINATION ${DATA_INSTALL_DIR}/twin ) -##### kwin3_web (module) ######################## +##### twin3_web (module) ######################## -tde_add_kpart( kwin3_web AUTOMOC +tde_add_kpart( twin3_web AUTOMOC SOURCES Web.cpp WebButton.cpp LINK tdecorations-shared tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/kwin/clients/web/Makefile.am b/kwin/clients/web/Makefile.am index bb5080889..4855602ca 100644 --- a/kwin/clients/web/Makefile.am +++ b/kwin/clients/web/Makefile.am @@ -1,15 +1,15 @@ INCLUDES = -I$(top_srcdir) $(all_includes) -kde_module_LTLIBRARIES = kwin3_web.la +kde_module_LTLIBRARIES = twin3_web.la -kwin3_web_la_SOURCES = Web.cpp WebButton.cpp +twin3_web_la_SOURCES = Web.cpp WebButton.cpp noinst_HEADERS = Web.h WebButton.h -kwin3_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -kwin3_web_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la +twin3_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin3_web_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la METASOURCES = AUTO -linkdir = $(kde_datadir)/kwin/ +linkdir = $(kde_datadir)/twin/ link_DATA = web.desktop EXTRA_DIST = $(link_DATA) diff --git a/kwin/clients/web/Web.cpp b/kwin/clients/web/Web.cpp index 9b5e434da..793b406af 100644 --- a/kwin/clients/web/Web.cpp +++ b/kwin/clients/web/Web.cpp @@ -1,5 +1,5 @@ /* - 'Web' kwin client + 'Web' twin client Copyright (C) 2005 Sandro Giessl <sandro@giessl.com> Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org> @@ -183,7 +183,7 @@ WebClient::init() if (0 != titleHeight_ % 2) titleHeight_ += 1; - KConfig c("kwinwebrc"); + KConfig c("twinwebrc"); c.setGroup("General"); tqshape_ = c.readBoolEntry("Shape", true); diff --git a/kwin/clients/web/Web.h b/kwin/clients/web/Web.h index 565fe8125..c2c18b0bd 100644 --- a/kwin/clients/web/Web.h +++ b/kwin/clients/web/Web.h @@ -1,5 +1,5 @@ /* - 'Web' kwin client + 'Web' twin client Copyright (C) 2005 Sandro Giessl <sandro@giessl.com> Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org> diff --git a/kwin/clients/web/WebButton.cpp b/kwin/clients/web/WebButton.cpp index c58a7e75d..bf1f54af4 100644 --- a/kwin/clients/web/WebButton.cpp +++ b/kwin/clients/web/WebButton.cpp @@ -1,5 +1,5 @@ /* - 'Web' kwin client + 'Web' twin client Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org> diff --git a/kwin/clients/web/WebButton.h b/kwin/clients/web/WebButton.h index b24136868..108aa2a52 100644 --- a/kwin/clients/web/WebButton.h +++ b/kwin/clients/web/WebButton.h @@ -1,5 +1,5 @@ /* - 'Web' kwin client + 'Web' twin client Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org> diff --git a/kwin/clients/web/web.desktop b/kwin/clients/web/web.desktop index 12ced34f4..e08748011 100644 --- a/kwin/clients/web/web.desktop +++ b/kwin/clients/web/web.desktop @@ -44,4 +44,4 @@ Name[vi]=Mạng Name[wa]=Waibe Name[zh_TW]=網頁 Name[zu]=I-Web -X-KDE-Library=kwin3_web +X-KDE-Library=twin3_web 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("")); } diff --git a/kwin/events.cpp b/kwin/events.cpp index 28489cc0e..45f4f6e35 100644 --- a/kwin/events.cpp +++ b/kwin/events.cpp @@ -661,7 +661,7 @@ bool Client::mapRequestEvent( XMapRequestEvent* e ) return true; // no messing with frame etc. } if( isTopMenu() && workspace()->managingTopMenus()) - return true; // kwin controls these + return true; // twin controls these switch ( mappingState() ) { case WithdrawnState: @@ -746,7 +746,7 @@ void Client::clientMessageEvent( XClientMessageEvent* e ) if ( e->message_type == atoms->kde_wm_change_state ) { if( isTopMenu() && workspace()->managingTopMenus()) - return; // kwin controls these + return; // twin controls these if( e->data.l[ 1 ] ) blockAnimation = true; if( e->data.l[ 0 ] == IconicState ) @@ -770,7 +770,7 @@ void Client::clientMessageEvent( XClientMessageEvent* e ) else if ( e->message_type == atoms->wm_change_state) { if( isTopMenu() && workspace()->managingTopMenus()) - return; // kwin controls these + return; // twin controls these if ( e->data.l[0] == IconicState ) minimize(); return; @@ -825,7 +825,7 @@ void Client::configureRequestEvent( XConfigureRequestEvent* e ) sendSyntheticConfigureNotify(); // SELI TODO accept configure requests for isDesktop windows (because kdesktop - // may get XRANDR resize event before kwin), but check it's still at the bottom? + // may get XRANDR resize event before twin), but check it's still at the bottom? } diff --git a/kwin/eventsrc b/kwin/eventsrc index 44d6342d0..20c3c9473 100644 --- a/kwin/eventsrc +++ b/kwin/eventsrc @@ -1,5 +1,5 @@ [!Global!] -IconName=kwin +IconName=twin Comment=The KDE Window Manager Comment[af]=Die KDE Venster Bestuurder Comment[ar]=مسير KDE للنوافذ diff --git a/kwin/geometry.cpp b/kwin/geometry.cpp index dea566556..2e0b205c7 100644 --- a/kwin/geometry.cpp +++ b/kwin/geometry.cpp @@ -22,7 +22,7 @@ License. See the file "COPYING" for the exact licensing terms. #include <kapplication.h> #include <kglobal.h> #include <tqpainter.h> -#include <kwin.h> +#include <twin.h> #include "placement.h" #include "notifications.h" @@ -316,7 +316,7 @@ TQRect Workspace::clientArea( clientAreaOption opt, const Client* c ) const TQPoint Workspace::adjustClientPosition( Client* c, TQPoint pos ) { //CT 16mar98, 27May98 - magics: BorderSnapZone, WindowSnapZone - //CT adapted for kwin on 25Nov1999 + //CT adapted for twin on 25Nov1999 //aleXXX 02Nov2000 added second snapping mode if (options->windowSnapZone || options->borderSnapZone ) { @@ -1470,7 +1470,7 @@ void Client::configureRequest( int value_mask, int rx, int ry, int rw, int rh, i // clever(?) workaround for applications like xv that want to set // the location to the current location but miscalculate the - // frame size due to kwin being a double-reparenting window + // frame size due to twin being a double-reparenting window // manager if ( new_pos.x() == x() + clientPos().x() && new_pos.y() == y() + clientPos().y() && gravity == NorthWestGravity && !from_tool ) diff --git a/kwin/geometrytip.cpp b/kwin/geometrytip.cpp index 8fb92dc49..83598d47c 100644 --- a/kwin/geometrytip.cpp +++ b/kwin/geometrytip.cpp @@ -14,7 +14,7 @@ namespace KWinInternal { GeometryTip::GeometryTip( const XSizeHints* xSizeHints, bool save_under ): - TQLabel(NULL, "kwingeometry" ) + TQLabel(NULL, "twingeometry" ) { setMargin(1); setIndent(0); diff --git a/kwin/group.cpp b/kwin/group.cpp index 8df006def..8d5bd7246 100644 --- a/kwin/group.cpp +++ b/kwin/group.cpp @@ -777,7 +777,7 @@ Window Client::verifyTransientFor( Window new_transient_for, bool defined ) new_property_value = new_transient_for = workspace()->rootWin(); } // The transient_for window may be embedded in another application, -// so kwin cannot see it. Try to find the managed client for the +// so twin cannot see it. Try to find the managed client for the // window and fix the transient_for property if possible. WId before_search = new_transient_for; while( new_transient_for != None diff --git a/kwin/kcmkwin/CMakeLists.txt b/kwin/kcmkwin/CMakeLists.txt index 76ed077ec..e0ca44195 100644 --- a/kwin/kcmkwin/CMakeLists.txt +++ b/kwin/kcmkwin/CMakeLists.txt @@ -9,8 +9,8 @@ # ################################################# -add_subdirectory( kwinoptions ) -add_subdirectory( kwindecoration ) -add_subdirectory( kwinrules ) +add_subdirectory( twinoptions ) +add_subdirectory( twindecoration ) +add_subdirectory( twinrules ) install( FILES showdesktop.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) diff --git a/kwin/kcmkwin/Makefile.am b/kwin/kcmkwin/Makefile.am index e3a4a3d24..1f371dd46 100644 --- a/kwin/kcmkwin/Makefile.am +++ b/kwin/kcmkwin/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = kwinoptions kwindecoration kwinrules +SUBDIRS = twinoptions twindecoration twinrules xdg_apps_DATA = showdesktop.desktop
\ No newline at end of file diff --git a/kwin/kcmkwin/kwindecoration/CMakeLists.txt b/kwin/kcmkwin/kwindecoration/CMakeLists.txt index 1d88ce5a9..5fbdb3653 100644 --- a/kwin/kcmkwin/kwindecoration/CMakeLists.txt +++ b/kwin/kcmkwin/kwindecoration/CMakeLists.txt @@ -12,7 +12,7 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/kwin/lib + ${CMAKE_SOURCE_DIR}/twin/lib ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -23,15 +23,15 @@ link_directories( ##### other data ################################ -install( FILES kwindecoration.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES twindecoration.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -##### kcm_kwindecoration (module) ############### +##### kcm_twindecoration (module) ############### -tde_add_kpart( kcm_kwindecoration AUTOMOC +tde_add_kpart( kcm_twindecoration AUTOMOC SOURCES - kwindecoration.cpp buttons.cpp - kwindecorationIface.skel preview.cpp + twindecoration.cpp buttons.cpp + twindecorationIface.skel preview.cpp LINK tdecorations-shared tdeui-shared Xext DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kwin/kcmkwin/kwindecoration/Makefile.am b/kwin/kcmkwin/kwindecoration/Makefile.am index e7bac2af8..021c1ac3e 100644 --- a/kwin/kcmkwin/kwindecoration/Makefile.am +++ b/kwin/kcmkwin/kwindecoration/Makefile.am @@ -1,18 +1,18 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes) -kde_module_LTLIBRARIES = kcm_kwindecoration.la +kde_module_LTLIBRARIES = kcm_twindecoration.la -kcm_kwindecoration_la_SOURCES = kwindecoration.cpp buttons.cpp kwindecorationIface.skel preview.cpp -noinst_HEADERS = kwindecoration.h kwindecorationIface.h buttons.h preview.h +kcm_twindecoration_la_SOURCES = twindecoration.cpp buttons.cpp twindecorationIface.skel preview.cpp +noinst_HEADERS = twindecoration.h twindecorationIface.h buttons.h preview.h -kcm_kwindecoration_la_LDFLAGS = \ +kcm_twindecoration_la_LDFLAGS = \ -module -avoid-version $(all_libraries) -no-undefined -kcm_kwindecoration_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la +kcm_twindecoration_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la METASOURCES = AUTO messages: - $(XGETTEXT) *.cpp -o $(podir)/kcmkwindecoration.pot + $(XGETTEXT) *.cpp -o $(podir)/kcmtwindecoration.pot -xdg_apps_DATA = kwindecoration.desktop +xdg_apps_DATA = twindecoration.desktop diff --git a/kwin/kcmkwin/kwindecoration/buttons.cpp b/kwin/kcmkwin/kwindecoration/buttons.cpp index 7ddcb2af2..2c450aed1 100644 --- a/kwin/kcmkwin/kwindecoration/buttons.cpp +++ b/kwin/kcmkwin/kwindecoration/buttons.cpp @@ -1,15 +1,15 @@ /* - This is the new kwindecoration kcontrol module + This is the new twindecoration kcontrol module Copyright (c) 2004, Sandro Giessl <sandro@giessl.com> Copyright (c) 2001 Karol Szwed <gallium@kde.org> http://gallium.n3.net/ - Supports new kwin configuration plugins, and titlebar button position + Supports new twin configuration plugins, and titlebar button position modification via dnd interface. - Based on original "kwintheme" (Window Borders) + Based on original "twintheme" (Window Borders) Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org> This program is free software; you can redistribute it and/or modify @@ -46,7 +46,7 @@ #include "pixmaps.h" -#define BUTTONDRAGMIMETYPE "application/x-kde_kwindecoration_buttons" +#define BUTTONDRAGMIMETYPE "application/x-kde_twindecoration_buttons" ButtonDrag::ButtonDrag( Button btn, TQWidget* parent, const char* name) : TQStoredDrag( BUTTONDRAGMIMETYPE, parent, name) { diff --git a/kwin/kcmkwin/kwindecoration/buttons.h b/kwin/kcmkwin/kwindecoration/buttons.h index 909adfe87..088d3414d 100644 --- a/kwin/kcmkwin/kwindecoration/buttons.h +++ b/kwin/kcmkwin/kwindecoration/buttons.h @@ -1,15 +1,15 @@ /* - This is the new kwindecoration kcontrol module + This is the new twindecoration kcontrol module Copyright (c) 2004, Sandro Giessl <sandro@giessl.com> Copyright (c) 2001 Karol Szwed <gallium@kde.org> http://gallium.n3.net/ - Supports new kwin configuration plugins, and titlebar button position + Supports new twin configuration plugins, and titlebar button position modification via dnd interface. - Based on original "kwintheme" (Window Borders) + Based on original "twintheme" (Window Borders) Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org> This program is free software; you can redistribute it and/or modify diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp index 65c951893..4ef509e5a 100644 --- a/kwin/kcmkwin/kwindecoration/kwindecoration.cpp +++ b/kwin/kcmkwin/kwindecoration/kwindecoration.cpp @@ -1,14 +1,14 @@ /* - This is the new kwindecoration kcontrol module + This is the new twindecoration kcontrol module Copyright (c) 2001 Karol Szwed <gallium@kde.org> http://gallium.n3.net/ - Supports new kwin configuration plugins, and titlebar button position + Supports new twin configuration plugins, and titlebar button position modification via dnd interface. - Based on original "kwintheme" (Window Borders) + Based on original "twintheme" (Window Borders) Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org> This program is free software; you can redistribute it and/or modify @@ -56,7 +56,7 @@ #include <kaboutdata.h> #include <dcopclient.h> -#include "kwindecoration.h" +#include "twindecoration.h" #include "preview.h" #include <kdecoration_plugins_p.h> #include <kdecorationfactory.h> @@ -64,16 +64,16 @@ // KCModule plugin interface // ========================= typedef KGenericFactory<KWinDecorationModule, TQWidget> KWinDecoFactory; -K_EXPORT_COMPONENT_FACTORY( kcm_kwindecoration, KWinDecoFactory("kcmkwindecoration") ) +K_EXPORT_COMPONENT_FACTORY( kcm_twindecoration, KWinDecoFactory("kcmtwindecoration") ) KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, const TQStringList &) : DCOPObject("KWinClientDecoration"), KCModule(KWinDecoFactory::instance(), parent, name), - kwinConfig("kwinrc"), + twinConfig("twinrc"), pluginObject(0) { - kwinConfig.setGroup("Style"); - plugins = new KDecorationPreviewPlugins( &kwinConfig ); + twinConfig.setGroup("Style"); + plugins = new KDecorationPreviewPlugins( &twinConfig ); TQVBoxLayout* layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); @@ -319,8 +319,8 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c // Set up the decoration lists and other UI settings findDecorations(); createDecorationList(); - readConfig( &kwinConfig ); - resetPlugin( &kwinConfig ); + readConfig( &twinConfig ); + resetPlugin( &twinConfig ); tabWidget->insertTab( pluginPage, i18n("&Window Decoration") ); tabWidget->insertTab( buttonPage, i18n("&Buttons") ); @@ -343,11 +343,11 @@ KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, c connect( cBorder, TQT_SIGNAL( activated( int )), TQT_SLOT( slotBorderChanged( int ))); // connect( cbUseMiniWindows, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) ); - // Allow kwin dcop signal to update our selection list - connectDCOPSignal("kwin", 0, "dcopResetAllClients()", "dcopUpdateClientList()", false); + // Allow twin dcop signal to update our selection list + connectDCOPSignal("twin", 0, "dcopResetAllClients()", "dcopUpdateClientList()", false); KAboutData *about = - new KAboutData(I18N_NOOP("kcmkwindecoration"), + new KAboutData(I18N_NOOP("kcmtwindecoration"), I18N_NOOP("Window Decoration Control Module"), 0, 0, KAboutData::License_GPL, I18N_NOOP("(c) 2001 Karol Szwed")); @@ -363,11 +363,11 @@ KWinDecorationModule::~KWinDecorationModule() } -// Find all theme desktop files in all 'data' dirs owned by kwin. +// Find all theme desktop files in all 'data' dirs owned by twin. // And insert these into a DecorationInfo structure void KWinDecorationModule::findDecorations() { - TQStringList dirList = KGlobal::dirs()->findDirs("data", "kwin"); + TQStringList dirList = KGlobal::dirs()->findDirs("data", "twin"); TQStringList::ConstIterator it; for (it = dirList.begin(); it != dirList.end(); it++) @@ -382,7 +382,7 @@ void KWinDecorationModule::findDecorations() KDesktopFile desktopFile(filename); TQString libName = desktopFile.readEntry("X-KDE-Library"); - if (!libName.isEmpty() && libName.startsWith( "kwin3_" )) + if (!libName.isEmpty() && libName.startsWith( "twin3_" )) { DecorationInfo di; di.name = desktopFile.readName(); @@ -395,12 +395,12 @@ void KWinDecorationModule::findDecorations() } -// Fills the decorationList with a list of available kwin decorations +// Fills the decorationList with a list of available twin decorations void KWinDecorationModule::createDecorationList() { TQValueList<DecorationInfo>::ConstIterator it; - // Sync with kwin hardcoded KDE2 style which has no desktop item + // Sync with twin hardcoded KDE2 style which has no desktop item TQStringList decorationNames; decorationNames.append( i18n("KDE 2") ); for (it = decorations.begin(); it != decorations.end(); ++it) @@ -415,11 +415,11 @@ void KWinDecorationModule::createDecorationList() // Reset the decoration plugin to what the user just selected void KWinDecorationModule::slotChangeDecoration( const TQString & text) { - KConfig kwinConfig("kwinrc"); - kwinConfig.setGroup("Style"); + KConfig twinConfig("twinrc"); + twinConfig.setGroup("Style"); // Let the user see config options for the currently selected decoration - resetPlugin( &kwinConfig, text ); + resetPlugin( &twinConfig, text ); } @@ -515,7 +515,7 @@ TQString KWinDecorationModule::decorationLibName( const TQString& name ) } if (libName.isEmpty()) - libName = "kwin_default"; // KDE 2 + libName = "twin_default"; // KDE 2 return libName; } @@ -525,8 +525,8 @@ TQString KWinDecorationModule::decorationLibName( const TQString& name ) // pluginConfigWidget, allowing for dynamic configuration of decorations void KWinDecorationModule::resetPlugin( KConfig* conf, const TQString& currentDecoName ) { - // Config names are "kwin_icewm_config" - // for "kwin3_icewm" kwin client + // Config names are "twin_icewm_config" + // for "twin3_icewm" twin client TQString oldName = styleToConfigLib( oldLibraryName ); @@ -585,7 +585,7 @@ void KWinDecorationModule::resetPlugin( KConfig* conf, const TQString& currentDe } -// Reads the kwin config settings, and sets all UI controls to those settings +// Reads the twin config settings, and sets all UI controls to those settings // Updating the config plugin if required void KWinDecorationModule::readConfig( KConfig* conf ) { @@ -599,7 +599,7 @@ void KWinDecorationModule::readConfig( KConfig* conf ) oldLibraryName = currentLibraryName; currentLibraryName = conf->readEntry("PluginLib", - ((TQPixmap::defaultDepth() > 8) ? "kwin_plastik" : "kwin_quartz")); + ((TQPixmap::defaultDepth() > 8) ? "twin_plastik" : "twin_quartz")); TQString decoName = decorationName( currentLibraryName ); // If we are using the "default" kde client, use the "default" entry. @@ -659,14 +659,14 @@ void KWinDecorationModule::readConfig( KConfig* conf ) } -// Writes the selected user configuration to the kwin config file +// Writes the selected user configuration to the twin config file void KWinDecorationModule::writeConfig( KConfig* conf ) { TQString name = decorationList->currentText(); TQString libName = decorationLibName( name ); - KConfig kwinConfig("kwinrc"); - kwinConfig.setGroup("Style"); + KConfig twinConfig("twinrc"); + twinConfig.setGroup("Style"); // General settings conf->writeEntry("PluginLib", libName); @@ -712,35 +712,35 @@ void KWinDecorationModule::dcopUpdateClientList() { // Changes the current active ListBox item, and // Loads a new plugin configuration tab if required. - KConfig kwinConfig("kwinrc"); - kwinConfig.setGroup("Style"); + KConfig twinConfig("twinrc"); + twinConfig.setGroup("Style"); - readConfig( &kwinConfig ); - resetPlugin( &kwinConfig ); + readConfig( &twinConfig ); + resetPlugin( &twinConfig ); } // Virutal functions required by KCModule void KWinDecorationModule::load() { - KConfig kwinConfig("kwinrc"); - kwinConfig.setGroup("Style"); + KConfig twinConfig("twinrc"); + twinConfig.setGroup("Style"); // Reset by re-reading the config - readConfig( &kwinConfig ); - resetPlugin( &kwinConfig ); + readConfig( &twinConfig ); + resetPlugin( &twinConfig ); } void KWinDecorationModule::save() { - KConfig kwinConfig("kwinrc"); - kwinConfig.setGroup("Style"); + KConfig twinConfig("twinrc"); + twinConfig.setGroup("Style"); - writeConfig( &kwinConfig ); - emit pluginSave( &kwinConfig ); + writeConfig( &twinConfig ); + emit pluginSave( &twinConfig ); - kwinConfig.sync(); + twinConfig.sync(); resetKWin(); // resetPlugin() will get called via the above DCOP function } @@ -807,8 +807,8 @@ void KWinDecorationModule::checkSupportedBorderSizes() TQString KWinDecorationModule::styleToConfigLib( TQString& styleLib ) { - if( styleLib.startsWith( "kwin3_" )) - return "kwin_" + styleLib.mid( 6 ) + "_config"; + if( styleLib.startsWith( "twin3_" )) + return "twin_" + styleLib.mid( 6 ) + "_config"; else return styleLib + "_config"; } @@ -828,13 +828,13 @@ TQString KWinDecorationModule::quickHelp() const void KWinDecorationModule::resetKWin() { - bool ok = kapp->dcopClient()->send("kwin*", "KWinInterface", + bool ok = kapp->dcopClient()->send("twin*", "KWinInterface", "reconfigure()", TQByteArray()); if (!ok) - kdDebug() << "kcmkwindecoration: Could not reconfigure kwin" << endl; + kdDebug() << "kcmtwindecoration: Could not reconfigure twin" << endl; } -#include "kwindecoration.moc" +#include "twindecoration.moc" // vim: ts=4 // kate: space-indent off; tab-width 4; diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.desktop b/kwin/kcmkwin/kwindecoration/kwindecoration.desktop index 3c5f12e6f..dc1e55ef6 100644 --- a/kwin/kcmkwin/kwindecoration/kwindecoration.desktop +++ b/kwin/kcmkwin/kwindecoration/kwindecoration.desktop @@ -1,12 +1,12 @@ [Desktop Entry] -Exec=kcmshell kwindecoration +Exec=kcmshell twindecoration Icon=kcmkwm Type=Application -DocPath=kcontrol/kwindecoration/index.html +DocPath=kcontrol/twindecoration/index.html X-KDE-ModuleType=Library -X-KDE-Library=kwindecoration -X-KDE-FactoryName=kwindecoration +X-KDE-Library=twindecoration +X-KDE-FactoryName=twindecoration Name=Window Decorations Name[af]=Venster Versierings @@ -162,70 +162,70 @@ Comment[zh_CN]=配置窗口标题的观感 Comment[zh_TW]=設定視窗標題列的外觀與感覺 Comment[zu]=Hlanganisela ukubona kanye nokuzwa kwezihloko zama-window -Keywords=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration -Keywords[ar]=kwin,نافذة,مسيير,الحافة,الشكل,سمة,مظهر,ملمس,تصميم,زر,معامل,مدبر,kwm,زخرفات -Keywords[az]=kwin,pəncərə,idarəçi,kənar,tərz,örtü,görünüş,toxuma,yer,düymə,applet,kənar,kwm,dekorasiya,bəzək -Keywords[be]=Акно,Кіраўнік,Мяжа,Стыль,Тэма,Вонкавы выгляд,Кнопкі,Апрацоўшчык,Край,Дэкарацыя,kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration -Keywords[bg]=прозорец, декорация, заглавие, бутони, меню, kwin, window, manager, border, style, theme, look, feel, layout, button, handle, edge, kwm, decoration -Keywords[ca]=kwin,finestra,gestor,vora,estil,tema,aspecte,comportament,disposició,botó,nansa,marges,kwm,decoració -Keywords[cs]=kwin,okno,správce,okraj,styl,motiv,vzhled,rozvržení,tlačítko,úchytka,hrana,kwm,dekorace -Keywords[csb]=kwin,òkno,menedżer,zberk,sztél,téma,wëzdrzatk,ùchòwanié,ùstôw,knąpa,ùchwët,rańt,kwm,dekòracëjô -Keywords[cy]=kwin,ffenestr,trefnydd,ymyl,arddull,thema,golwg,teimlad,haenlun,botwm,carn,kwm,addurniad -Keywords[da]=kwin,vindue,håndtering,kant,stil,tema,udseende,fornemmelse,layout,knap,håndtag,kant,kwm,dekoration +Keywords=twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration +Keywords[ar]=twin,نافذة,مسيير,الحافة,الشكل,سمة,مظهر,ملمس,تصميم,زر,معامل,مدبر,kwm,زخرفات +Keywords[az]=twin,pəncərə,idarəçi,kənar,tərz,örtü,görünüş,toxuma,yer,düymə,applet,kənar,kwm,dekorasiya,bəzək +Keywords[be]=Акно,Кіраўнік,Мяжа,Стыль,Тэма,Вонкавы выгляд,Кнопкі,Апрацоўшчык,Край,Дэкарацыя,twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration +Keywords[bg]=прозорец, декорация, заглавие, бутони, меню, twin, window, manager, border, style, theme, look, feel, layout, button, handle, edge, kwm, decoration +Keywords[ca]=twin,finestra,gestor,vora,estil,tema,aspecte,comportament,disposició,botó,nansa,marges,kwm,decoració +Keywords[cs]=twin,okno,správce,okraj,styl,motiv,vzhled,rozvržení,tlačítko,úchytka,hrana,kwm,dekorace +Keywords[csb]=twin,òkno,menedżer,zberk,sztél,téma,wëzdrzatk,ùchòwanié,ùstôw,knąpa,ùchwët,rańt,kwm,dekòracëjô +Keywords[cy]=twin,ffenestr,trefnydd,ymyl,arddull,thema,golwg,teimlad,haenlun,botwm,carn,kwm,addurniad +Keywords[da]=twin,vindue,håndtering,kant,stil,tema,udseende,fornemmelse,layout,knap,håndtag,kant,kwm,dekoration Keywords[de]=KWin,Kwm,Fenster,Manager,Rahmen,Design,Stile,Themes,Optik,Erscheinungsbild,Layout,Knöpfe,Ränder,Dekorationen -Keywords[el]=kwin,παράθυρο,διαχειριστής,περίγραμμα,στυλ,θέμα,εμφάνιση,αίσθηση,διάταξη,κουμπί,χειρισμός,άκρο,kwm,διακόσμηση -Keywords[eo]=kwin,fenestro,administrilo,rando,stilo,etoso,aspekto,konduto,aranĝo,butono,eĝo,kwm,ornamo -Keywords[es]=kwin,ventana,gestor,borde,estilo,tema,aspecto,comportamiento,disposición,botón,asa,esquina,kwm,decoración -Keywords[et]=kwin,aken,haldur,piire,stiil,teema,välimus,kasutamine,nupud,serv,kwm,dekoratsioon -Keywords[eu]=kwin,leihoa,kudeatzailea,ertza,estiloa,gaia,itxura,antolaketa,botoia, maneiatzailea,ertzea,kwm,dekorazioa -Keywords[fa]=kwin، پنجره، مدیر، لبه، سبک، چهره، ظاهر، احساس، طرحبندی، دکمه، گرداندن، لبه، kwm، تزئین -Keywords[fi]=kwin,ikkuna,ikkunaohjelma,ikkunoinnin hallintaohjelma,tausta,tyyli,teema,ulkonäkö,tuntuma,ulkoasu,painike,kahva,kulma,kwm,kehys -Keywords[fr]=kwin,fenêtre,gestionnaire,bordure,style,thème,apparence,ergonomie,disposition,bouton,poignée,bord,kwm,décoration -Keywords[fy]=kwin,window,manager,rand,stijl,theme,tema,look,uiterlijk,gedrag,feel,layout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheer,finster,râne,kader,styltema,uterlik,gedrach,finsterbehear -Keywords[ga]=kwin,fuinneog,bainisteoir,imlíne,stíl,téama,leagan amach,cnaipe,hanla,ciumhais,kwm,maisiúchán -Keywords[gl]=kwin,fiestra,xestor,beira,estilo,tema,apariencia,formato,botón,xestión,esquina,kwm,decoración -Keywords[he]=מנהל חלונות,חלונות,מנהל,גבול,מסגרת,סגנון,ערכה,ערכת נושא,מראה,תחושה,פריסה,תצוגה,כפתור,ידית,קצה,קישוט, kwin,window,manager,border,style,theme,look,feel,layout,button,handle, edge,kwm,decoration +Keywords[el]=twin,παράθυρο,διαχειριστής,περίγραμμα,στυλ,θέμα,εμφάνιση,αίσθηση,διάταξη,κουμπί,χειρισμός,άκρο,kwm,διακόσμηση +Keywords[eo]=twin,fenestro,administrilo,rando,stilo,etoso,aspekto,konduto,aranĝo,butono,eĝo,kwm,ornamo +Keywords[es]=twin,ventana,gestor,borde,estilo,tema,aspecto,comportamiento,disposición,botón,asa,esquina,kwm,decoración +Keywords[et]=twin,aken,haldur,piire,stiil,teema,välimus,kasutamine,nupud,serv,kwm,dekoratsioon +Keywords[eu]=twin,leihoa,kudeatzailea,ertza,estiloa,gaia,itxura,antolaketa,botoia, maneiatzailea,ertzea,kwm,dekorazioa +Keywords[fa]=twin، پنجره، مدیر، لبه، سبک، چهره، ظاهر، احساس، طرحبندی، دکمه، گرداندن، لبه، kwm، تزئین +Keywords[fi]=twin,ikkuna,ikkunaohjelma,ikkunoinnin hallintaohjelma,tausta,tyyli,teema,ulkonäkö,tuntuma,ulkoasu,painike,kahva,kulma,kwm,kehys +Keywords[fr]=twin,fenêtre,gestionnaire,bordure,style,thème,apparence,ergonomie,disposition,bouton,poignée,bord,kwm,décoration +Keywords[fy]=twin,window,manager,rand,stijl,theme,tema,look,uiterlijk,gedrag,feel,layout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheer,finster,râne,kader,styltema,uterlik,gedrach,finsterbehear +Keywords[ga]=twin,fuinneog,bainisteoir,imlíne,stíl,téama,leagan amach,cnaipe,hanla,ciumhais,kwm,maisiúchán +Keywords[gl]=twin,fiestra,xestor,beira,estilo,tema,apariencia,formato,botón,xestión,esquina,kwm,decoración +Keywords[he]=מנהל חלונות,חלונות,מנהל,גבול,מסגרת,סגנון,ערכה,ערכת נושא,מראה,תחושה,פריסה,תצוגה,כפתור,ידית,קצה,קישוט, twin,window,manager,border,style,theme,look,feel,layout,button,handle, edge,kwm,decoration Keywords[hi]=के-विन,विंडो,प्रबंधक,बार्डर,शैली,प्रसंग,रूप,अनुभव,ले-आउट,बटन,हैंडल,किनारा,केडबल्यूएम,सजावट -Keywords[hr]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,prozor,upravljanje,obrub,stil,tema,izgled,raspored,gumb,rukovanje,rub,ukras +Keywords[hr]=twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,prozor,upravljanje,obrub,stil,tema,izgled,raspored,gumb,rukovanje,rub,ukras Keywords[hu]=KWin,ablak,kezelő,szegély,stílus,téma,kinézet,megjelenés,elrendezés,nyomógomb,fogantyú,perem,kwm,ablakstílus -Keywords[is]=kwin,gluggi,gluggastjóri,gluggar,kantar,rammi,skreyting,þema,stíll,útlit,takki,kwm,skraut -Keywords[it]=kwin,finestra,window manager,bordo,stile,tema,aspetto,pulsante,maniglia,bordo,kwm,decorazione -Keywords[ja]=kwin,ウィンドウ,マネージャ,枠,スタイル,テーマ,ルック,外観,レイアウト,ボタン,ハンドル,エッジ,kwm,装飾 -Keywords[km]=kwin,បង្អួច,កម្មវិធីគ្រប់គ្រង,ស៊ុម,រចនាប័ទ្ម,ស្បែក,មុខងារ,ប្លង់,ប៊ូតុង,ការប្រើ,គែម,kwm,ការតុបតែង -Keywords[lt]=kwin,window,manager,border,style,theme,look,feel,layout,buttons,handle,edge,kwm,decoration,langas,tvarkyklė,rėmelis,stilius,tema,žiūrėti,jausti,išdėstymas,mygtukai,kraštas,dekoracija -Keywords[lv]=kwin, logs, menedžeris, rāmis, stils, tēma, skats, gars, izkārtojums, poga, rokturis, stūris, kwm, dekorācija -Keywords[mk]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,прозорец,менаџер,граница,стил,тема,изглед,чувство,распоред,копче,рачка,раб,декорација +Keywords[is]=twin,gluggi,gluggastjóri,gluggar,kantar,rammi,skreyting,þema,stíll,útlit,takki,kwm,skraut +Keywords[it]=twin,finestra,window manager,bordo,stile,tema,aspetto,pulsante,maniglia,bordo,kwm,decorazione +Keywords[ja]=twin,ウィンドウ,マネージャ,枠,スタイル,テーマ,ルック,外観,レイアウト,ボタン,ハンドル,エッジ,kwm,装飾 +Keywords[km]=twin,បង្អួច,កម្មវិធីគ្រប់គ្រង,ស៊ុម,រចនាប័ទ្ម,ស្បែក,មុខងារ,ប្លង់,ប៊ូតុង,ការប្រើ,គែម,kwm,ការតុបតែង +Keywords[lt]=twin,window,manager,border,style,theme,look,feel,layout,buttons,handle,edge,kwm,decoration,langas,tvarkyklė,rėmelis,stilius,tema,žiūrėti,jausti,išdėstymas,mygtukai,kraštas,dekoracija +Keywords[lv]=twin, logs, menedžeris, rāmis, stils, tēma, skats, gars, izkārtojums, poga, rokturis, stūris, kwm, dekorācija +Keywords[mk]=twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,прозорец,менаџер,граница,стил,тема,изглед,чувство,распоред,копче,рачка,раб,декорација Keywords[mn]=KWin,Kwm,Цонх,Manager,Хүрээ,Design,Хэлбэр,Загвар, Optik,Харагдалт,Layout,Товч,Өнцөг,Засал -Keywords[mt]=kwin, window, manager, border, bordura, stil, tema, apparenza, style, theme, look, feel, layout, tqassim, użu, button, handle, edge, kwm, decoration -Keywords[nb]=kwin,vindu,vindusstyring,styrer,ramme,stil,tema,utseende,layout,knapp,kant,kwm,pynt,dekorasjon -Keywords[nds]=kwin,Finster,Finsterpleger,manager,Rahmen,Stil,Muster,look,feel,layout,Knoop,Greep,Rand,kwm,Dekoratschoon +Keywords[mt]=twin, window, manager, border, bordura, stil, tema, apparenza, style, theme, look, feel, layout, tqassim, użu, button, handle, edge, kwm, decoration +Keywords[nb]=twin,vindu,vindusstyring,styrer,ramme,stil,tema,utseende,layout,knapp,kant,kwm,pynt,dekorasjon +Keywords[nds]=twin,Finster,Finsterpleger,manager,Rahmen,Stil,Muster,look,feel,layout,Knoop,Greep,Rand,kwm,Dekoratschoon Keywords[ne]=के विन,सञ्झ्याल, प्रबन्धक, किनारा, शैली, विषयवस्तु, हेराइ, बुझाइ, सजावट, बटन, ह्यान्डल, छेउ,kwm, सजावट -Keywords[nl]=kwin,window,manager,rand,stijl,theme,thema,look,uiterlijk,gedrag,feel, layout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheer -Keywords[nn]=kwin,vindauge,kant,bord,stil,tema,utsjånad,bunad,knapp,handtak,kwm,dekorasjon -Keywords[nso]=kwin,window,molaodi,mollwane,mokgwa,molaetsa,tebelego,maikutlo,peakanyo,setobetswa,moswaro,nthla,kwm,kgabiso -Keywords[pa]=kwin,handle,edge,kwm,decoration,ਝਰੋਖਾ,ਮੈਨੇਜਰ,ਹਾਸ਼ੀਆ,ਸ਼ੈਲੀ,ਸਰੂਪ,ਦਿੱਖ,ਖਾਕਾ,ਬਟਨ,ਹੈਂਡਲ,ਸਜਾਵਟ -Keywords[pl]=kwin,okno,menedżer,brzeg,styl,motyw,wygląd,zachowanie,układ,przycisk,uchwyt,krawędź,kwm,dekoracja -Keywords[pt]=kwin,janela,gestor,contorno,estilo,tema,aparência,comportamento,visual,botão,pega,extremo,kwm,decoração -Keywords[pt_BR]=kwin,janela,gerenciador,borda,estilo,tema,aparência,aparência,botão, gerenciador,borda,kwm,decoração -Keywords[ro]=kwin,fereastră,manager,margine,stil,tematică,aspect,comportament,format,buton,kwm,decorare -Keywords[rw]=kwin,idirishya,muyobozi,impera,imisusire,insanganyamatsiko,imboneko,kumva,imigaragarire,buto,ikirindi,impera,kwm,ugutaaka -Keywords[se]=kwin,láse,gieđahalli,ravda,stiila,fáddá,fárda,dovdu,hápmi,boallu,geavja,ravda,kwm,hearva -Keywords[sk]=kwin,okno,správa,okraj,štýl,téma,vzhľad,rozloženie,tlačidlo,hrana,kwm,dekorácia,oblasť -Keywords[sl]=kwin,okno,upravitelj,rob,meja,slog,stil,tema,pogled,občutek,gumb,ročaj,rob,kwm,okrasek -Keywords[sr]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,прозор,менаџер,оквир,стил,тема,изглед,дугме,хватаљка,декорација -Keywords[sr@Latn]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,prozor,menadžer,okvir,stil,tema,izgled,dugme,hvataljka,dekoracija -Keywords[sv]=kwin,fönster,hanterare,kant,stil,tema,utseende,känsla,layout,knapp,hantera,kant,kwm,dekoration -Keywords[ta]=kwin,சாளரம்,மேலாளர்,விளிம்பு,பாணி,தலைப்பு,பார்வை,உணர்தல்,உருவரை,விசை,கையாள்,முனை,kwm,அலங்கரிப்பு -Keywords[th]=kwin,หน้าต่าง,ตัวจัดการ,กรอบ,ลักษณะ,ชุดตกแต่ง,มองเห็น,รู้สึก,การจัดวาง,ปุ่ม,ที่จับ,ขอบ,kwm,การตกแต่ง -Keywords[tr]=kwin,pencere,yönetici,kenar,stil,tema,görünüş,doku,yerleşim,düğme,tutamaç,kenar,kwm,dekorasyon -Keywords[uk]=kwin,вікно,менеджер,границя,стиль,тема,вигляд,поведінка,розклад,кнопка,handle,край,kwm,обрамлення -Keywords[uz]=kwin,kwm,bezak,oyna,boshqaruvchi,usul,tashqi koʻrinish -Keywords[uz@cyrillic]=kwin,kwm,безак,ойна,бошқарувчи,усул,ташқи кўриниш -Keywords[ven]=kwin,windo,mulanguli,mukanoni,tshitaela,thero,sedza,upfa,vhuvha,bathene,fara,mafhedziselo,kwn,u khavhisedza -Keywords[vi]=kwin,cửa sổ,quản lý,bờ,kiểu,sắc thái,ngoại hình,cảm nhận,sắp xếp,nút,điều khiển,cạnh,kwm,trang trí -Keywords[wa]=kwin,kpurnea,purnea,manaedjeu,boird,stîle,tinme,rivnance,layout;loukance,boton,apougnî,costé,kwm,gåliotaedje -Keywords[xh]=kwin,window,umphathi,umda,uhlobo,umxholo wokuxoxwa,jonga,yiva,beka,iqhosha,umqheba,umda,kwm,uhombiso -Keywords[zh_CN]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,窗口,管理器,边框,样式,主题,观感,布局,按钮,处理,边缘,装饰 -Keywords[zh_TW]=kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,視窗,管理員,邊框,風格,佈景主題,外觀,感覺,佈局,按鈕,邊緣,裝飾 -Keywords[zu]=kwin,i-window,imenenja,umngcele,isitayela,bona,izwa, isendlalelo,inkinobho,isibambo,unqenqema,kwm,umhlobiso +Keywords[nl]=twin,window,manager,rand,stijl,theme,thema,look,uiterlijk,gedrag,feel, layout,opmaak,button,knoppen,handle,rand,kwm,decoratie,windowmanager,venster,vensterbeheer +Keywords[nn]=twin,vindauge,kant,bord,stil,tema,utsjånad,bunad,knapp,handtak,kwm,dekorasjon +Keywords[nso]=twin,window,molaodi,mollwane,mokgwa,molaetsa,tebelego,maikutlo,peakanyo,setobetswa,moswaro,nthla,kwm,kgabiso +Keywords[pa]=twin,handle,edge,kwm,decoration,ਝਰੋਖਾ,ਮੈਨੇਜਰ,ਹਾਸ਼ੀਆ,ਸ਼ੈਲੀ,ਸਰੂਪ,ਦਿੱਖ,ਖਾਕਾ,ਬਟਨ,ਹੈਂਡਲ,ਸਜਾਵਟ +Keywords[pl]=twin,okno,menedżer,brzeg,styl,motyw,wygląd,zachowanie,układ,przycisk,uchwyt,krawędź,kwm,dekoracja +Keywords[pt]=twin,janela,gestor,contorno,estilo,tema,aparência,comportamento,visual,botão,pega,extremo,kwm,decoração +Keywords[pt_BR]=twin,janela,gerenciador,borda,estilo,tema,aparência,aparência,botão, gerenciador,borda,kwm,decoração +Keywords[ro]=twin,fereastră,manager,margine,stil,tematică,aspect,comportament,format,buton,kwm,decorare +Keywords[rw]=twin,idirishya,muyobozi,impera,imisusire,insanganyamatsiko,imboneko,kumva,imigaragarire,buto,ikirindi,impera,kwm,ugutaaka +Keywords[se]=twin,láse,gieđahalli,ravda,stiila,fáddá,fárda,dovdu,hápmi,boallu,geavja,ravda,kwm,hearva +Keywords[sk]=twin,okno,správa,okraj,štýl,téma,vzhľad,rozloženie,tlačidlo,hrana,kwm,dekorácia,oblasť +Keywords[sl]=twin,okno,upravitelj,rob,meja,slog,stil,tema,pogled,občutek,gumb,ročaj,rob,kwm,okrasek +Keywords[sr]=twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,прозор,менаџер,оквир,стил,тема,изглед,дугме,хватаљка,декорација +Keywords[sr@Latn]=twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,prozor,menadžer,okvir,stil,tema,izgled,dugme,hvataljka,dekoracija +Keywords[sv]=twin,fönster,hanterare,kant,stil,tema,utseende,känsla,layout,knapp,hantera,kant,kwm,dekoration +Keywords[ta]=twin,சாளரம்,மேலாளர்,விளிம்பு,பாணி,தலைப்பு,பார்வை,உணர்தல்,உருவரை,விசை,கையாள்,முனை,kwm,அலங்கரிப்பு +Keywords[th]=twin,หน้าต่าง,ตัวจัดการ,กรอบ,ลักษณะ,ชุดตกแต่ง,มองเห็น,รู้สึก,การจัดวาง,ปุ่ม,ที่จับ,ขอบ,kwm,การตกแต่ง +Keywords[tr]=twin,pencere,yönetici,kenar,stil,tema,görünüş,doku,yerleşim,düğme,tutamaç,kenar,kwm,dekorasyon +Keywords[uk]=twin,вікно,менеджер,границя,стиль,тема,вигляд,поведінка,розклад,кнопка,handle,край,kwm,обрамлення +Keywords[uz]=twin,kwm,bezak,oyna,boshqaruvchi,usul,tashqi koʻrinish +Keywords[uz@cyrillic]=twin,kwm,безак,ойна,бошқарувчи,усул,ташқи кўриниш +Keywords[ven]=twin,windo,mulanguli,mukanoni,tshitaela,thero,sedza,upfa,vhuvha,bathene,fara,mafhedziselo,kwn,u khavhisedza +Keywords[vi]=twin,cửa sổ,quản lý,bờ,kiểu,sắc thái,ngoại hình,cảm nhận,sắp xếp,nút,điều khiển,cạnh,kwm,trang trí +Keywords[wa]=twin,kpurnea,purnea,manaedjeu,boird,stîle,tinme,rivnance,layout;loukance,boton,apougnî,costé,kwm,gåliotaedje +Keywords[xh]=twin,window,umphathi,umda,uhlobo,umxholo wokuxoxwa,jonga,yiva,beka,iqhosha,umqheba,umda,kwm,uhombiso +Keywords[zh_CN]=twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,窗口,管理器,边框,样式,主题,观感,布局,按钮,处理,边缘,装饰 +Keywords[zh_TW]=twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,視窗,管理員,邊框,風格,佈景主題,外觀,感覺,佈局,按鈕,邊緣,裝飾 +Keywords[zu]=twin,i-window,imenenja,umngcele,isitayela,bona,izwa, isendlalelo,inkinobho,isibambo,unqenqema,kwm,umhlobiso Categories=Qt;KDE;X-KDE-settings-looknfeel; diff --git a/kwin/kcmkwin/kwindecoration/kwindecoration.h b/kwin/kcmkwin/kwindecoration/kwindecoration.h index 53b3ed6ae..f6b535024 100644 --- a/kwin/kcmkwin/kwindecoration/kwindecoration.h +++ b/kwin/kcmkwin/kwindecoration/kwindecoration.h @@ -1,14 +1,14 @@ /* - This is the new kwindecoration kcontrol module + This is the new twindecoration kcontrol module Copyright (c) 2001 Karol Szwed <gallium@kde.org> http://gallium.n3.net/ - Supports new kwin configuration plugins, and titlebar button position + Supports new twin configuration plugins, and titlebar button position modification via dnd interface. - Based on original "kwintheme" (Window Borders) + Based on original "twintheme" (Window Borders) Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org> This program is free software; you can redistribute it and/or modify @@ -38,7 +38,7 @@ #include <kdecoration.h> -#include "kwindecorationIface.h" +#include "twindecorationIface.h" class KComboBox; class TQCheckBox; @@ -109,7 +109,7 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface KDecorationPreview* preview; KDecorationPlugins* plugins; - KConfig kwinConfig; + KConfig twinConfig; TQCheckBox* cbUseCustomButtonPositions; // TQCheckBox* cbUseMiniWindows; diff --git a/kwin/kcmkwin/kwindecoration/kwindecorationIface.h b/kwin/kcmkwin/kwindecoration/kwindecorationIface.h index f45be6b7b..f50082648 100644 --- a/kwin/kcmkwin/kwindecoration/kwindecorationIface.h +++ b/kwin/kcmkwin/kwindecoration/kwindecorationIface.h @@ -1,14 +1,14 @@ /* - This is the new kwindecoration kcontrol module + This is the new twindecoration kcontrol module Copyright (c) 2001 Karol Szwed (gallium) <karlmail@usa.net> http://gallium.n3.net/ - Supports new kwin configuration plugins, and titlebar button position + Supports new twin configuration plugins, and titlebar button position modification via dnd interface. - Based on original "kwintheme" (Window Borders) + Based on original "twintheme" (Window Borders) Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org> This program is free software; you can redistribute it and/or modify diff --git a/kwin/kcmkwin/kwindecoration/pixmaps.h b/kwin/kcmkwin/kwindecoration/pixmaps.h index 76f60b3e9..710e01425 100644 --- a/kwin/kcmkwin/kwindecoration/pixmaps.h +++ b/kwin/kcmkwin/kwindecoration/pixmaps.h @@ -1,15 +1,15 @@ /* - This is the new kwindecoration kcontrol module + This is the new twindecoration kcontrol module Copyright (c) 2004, Sandro Giessl <sandro@giessl.com> Copyright (c) 2001 Karol Szwed <gallium@kde.org> http://gallium.n3.net/ - Supports new kwin configuration plugins, and titlebar button position + Supports new twin configuration plugins, and titlebar button position modification via dnd interface. - Based on original "kwintheme" (Window Borders) + Based on original "twintheme" (Window Borders) Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org> This program is free software; you can redistribute it and/or modify diff --git a/kwin/kcmkwin/kwindecoration/preview.cpp b/kwin/kcmkwin/kwindecoration/preview.cpp index ea894ecbc..ee8c59c75 100644 --- a/kwin/kcmkwin/kwindecoration/preview.cpp +++ b/kwin/kcmkwin/kwindecoration/preview.cpp @@ -454,7 +454,7 @@ KDecorationPreviewOptions::~KDecorationPreviewOptions() unsigned long KDecorationPreviewOptions::updateSettings() { - KConfig cfg( "kwinrc", true ); + KConfig cfg( "twinrc", true ); unsigned long changed = 0; changed |= d->updateKWinSettings( &cfg ); 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); } diff --git a/kwin/kcmkwin/kwinrules/CMakeLists.txt b/kwin/kcmkwin/kwinrules/CMakeLists.txt index d505cf709..29aa24e4e 100644 --- a/kwin/kcmkwin/kwinrules/CMakeLists.txt +++ b/kwin/kcmkwin/kwinrules/CMakeLists.txt @@ -13,7 +13,7 @@ add_definitions( -DKCMRULES ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kwin/lib + ${CMAKE_SOURCE_DIR}/twin/lib ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) @@ -24,30 +24,30 @@ link_directories( ##### other data ################################ -install( FILES kwinrules.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES twinrules.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -##### kcm_kwinrules (module) #################### +##### kcm_twinrules (module) #################### -tde_add_kpart( kcm_kwinrules AUTOMOC +tde_add_kpart( kcm_twinrules AUTOMOC SOURCES kcm.cpp - LINK kwinrules-static + LINK twinrules-static DESTINATION ${PLUGIN_INSTALL_DIR} ) -##### kwin_rules_dialog (tdeinit) ############### +##### twin_rules_dialog (tdeinit) ############### -tde_add_tdeinit_executable( kwin_rules_dialog +tde_add_tdeinit_executable( twin_rules_dialog SOURCES main.cpp - LINK ${TQT_LIBRARIES} kwinrules-static ) + LINK ${TQT_LIBRARIES} twinrules-static ) -##### kwinrules (static) ######################## +##### twinrules (static) ######################## -set( target kwinrules ) +set( target twinrules ) set( ${target}_SRCS - ruleswidget.cpp ruleslist.cpp kwinsrc.cpp detectwidget.cpp + ruleswidget.cpp ruleslist.cpp twinsrc.cpp detectwidget.cpp ruleswidgetbase.ui ruleslistbase.ui detectwidgetbase.ui editshortcutbase.ui ) diff --git a/kwin/kcmkwin/kwinrules/Makefile.am b/kwin/kcmkwin/kwinrules/Makefile.am index 6fe4b8108..c9e7c7beb 100644 --- a/kwin/kcmkwin/kwinrules/Makefile.am +++ b/kwin/kcmkwin/kwinrules/Makefile.am @@ -1,29 +1,29 @@ METASOURCES = AUTO AM_CPPFLAGS = $(all_includes) -DKCMRULES -INCLUDES = -I$(top_srcdir)/kwin/lib +INCLUDES = -I$(top_srcdir)/twin/lib bin_PROGRAMS = lib_LTLIBRARIES = -tdeinit_LTLIBRARIES = kwin_rules_dialog.la -kde_module_LTLIBRARIES = kcm_kwinrules.la -noinst_LTLIBRARIES = libkwinrules.la +tdeinit_LTLIBRARIES = twin_rules_dialog.la +kde_module_LTLIBRARIES = kcm_twinrules.la +noinst_LTLIBRARIES = libtwinrules.la -libkwinrules_la_SOURCES = ruleswidget.cpp ruleslist.cpp kwinsrc.cpp detectwidget.cpp \ +libtwinrules_la_SOURCES = ruleswidget.cpp ruleslist.cpp twinsrc.cpp detectwidget.cpp \ ruleswidgetbase.ui ruleslistbase.ui detectwidgetbase.ui editshortcutbase.ui -libkwinrules_la_LDFLAGS = $(all_libraries) -no-undefined -libkwinrules_la_LIBADD = $(LIB_TDEUI) +libtwinrules_la_LDFLAGS = $(all_libraries) -no-undefined +libtwinrules_la_LIBADD = $(LIB_TDEUI) -kcm_kwinrules_la_SOURCES = kcm.cpp -kcm_kwinrules_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined -kcm_kwinrules_la_LIBADD = libkwinrules.la -kcm_kwinrules_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.h +kcm_twinrules_la_SOURCES = kcm.cpp +kcm_twinrules_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined +kcm_twinrules_la_LIBADD = libtwinrules.la +kcm_twinrules_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.h -kwin_rules_dialog_la_SOURCES = main.cpp -kwin_rules_dialog_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined -kwin_rules_dialog_la_LIBADD = libkwinrules.la -kwin_rules_dialog_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.h +twin_rules_dialog_la_SOURCES = main.cpp +twin_rules_dialog_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined +twin_rules_dialog_la_LIBADD = libtwinrules.la +twin_rules_dialog_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.h messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/kcmkwinrules.pot + $(XGETTEXT) *.cpp -o $(podir)/kcmtwinrules.pot -xdg_apps_DATA = kwinrules.desktop +xdg_apps_DATA = twinrules.desktop diff --git a/kwin/kcmkwin/kwinrules/detectwidget.cpp b/kwin/kcmkwin/kwinrules/detectwidget.cpp index c30ae24ff..d82836868 100644 --- a/kwin/kcmkwin/kwinrules/detectwidget.cpp +++ b/kwin/kcmkwin/kwinrules/detectwidget.cpp @@ -21,7 +21,7 @@ #include <kapplication.h> #include <klocale.h> #include <kdebug.h> -#include <kwin.h> +#include <twin.h> #include <tqlabel.h> #include <tqradiobutton.h> #include <tqcheckbox.h> diff --git a/kwin/kcmkwin/kwinrules/detectwidget.h b/kwin/kcmkwin/kwinrules/detectwidget.h index 9a2cca3d2..75e725f5f 100644 --- a/kwin/kcmkwin/kwinrules/detectwidget.h +++ b/kwin/kcmkwin/kwinrules/detectwidget.h @@ -23,7 +23,7 @@ #include "detectwidgetbase.h" #include <kdialogbase.h> -#include <kwin.h> +#include <twin.h> #include "../../rules.h" diff --git a/kwin/kcmkwin/kwinrules/kcm.cpp b/kwin/kcmkwin/kwinrules/kcm.cpp index 90802c41d..c7cdc7587 100644 --- a/kwin/kcmkwin/kwinrules/kcm.cpp +++ b/kwin/kcmkwin/kwinrules/kcm.cpp @@ -28,10 +28,10 @@ #include "ruleslist.h" extern "C" - KDE_EXPORT KCModule *create_kwinrules( TQWidget *parent, const char *name ) + KDE_EXPORT KCModule *create_twinrules( TQWidget *parent, const char *name ) { - //CT there's need for decision: kwm or kwin? - KGlobal::locale()->insertCatalogue( "kcmkwinrules" ); + //CT there's need for decision: kwm or twin? + KGlobal::locale()->insertCatalogue( "kcmtwinrules" ); return new KWinInternal::KCMRules( parent, name ); } @@ -40,13 +40,13 @@ namespace KWinInternal KCMRules::KCMRules( TQWidget *parent, const char *name ) : KCModule( parent, name ) -, config( "kwinrulesrc" ) +, config( "twinrulesrc" ) { TQVBoxLayout *layout = new TQVBoxLayout( this ); widget = new KCMRulesList( this ); layout->addWidget( TQT_TQWIDGET(widget) ); connect( widget, TQT_SIGNAL( changed( bool )), TQT_SLOT( moduleChanged( bool ))); - KAboutData *about = new KAboutData(I18N_NOOP( "kcmkwinrules" ), + KAboutData *about = new KAboutData(I18N_NOOP( "kcmtwinrules" ), I18N_NOOP( "Window-Specific Settings Configuration Module" ), 0, 0, KAboutData::License_GPL, I18N_NOOP( "(c) 2004 KWin and KControl Authors" )); about->addAuthor("Lubos Lunak",0,"l.lunak@kde.org"); @@ -64,11 +64,11 @@ void KCMRules::save() { widget->save(); emit KCModule::changed( false ); - // Send signal to kwin + // Send signal to twin config.sync(); if( !kapp->dcopClient()->isAttached()) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); + kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); } void KCMRules::defaults() diff --git a/kwin/kcmkwin/kwinrules/kwinrules.desktop b/kwin/kcmkwin/kwinrules/kwinrules.desktop index 245994a8a..9d82ea38a 100644 --- a/kwin/kcmkwin/kwinrules/kwinrules.desktop +++ b/kwin/kcmkwin/kwinrules/kwinrules.desktop @@ -1,12 +1,12 @@ [Desktop Entry] Icon=kcmkwm Type=Application -Exec=kcmshell kwinrules +Exec=kcmshell twinrules DocPath=kcontrol/windowmanagement/index.html X-KDE-ModuleType=Library -X-KDE-Library=kwinrules -X-KDE-FactoryName=kwinrules +X-KDE-Library=twinrules +X-KDE-FactoryName=twinrules Name=Window-Specific Settings Name[af]=Venser spesifike Instellings diff --git a/kwin/kcmkwin/kwinrules/kwinsrc.cpp b/kwin/kcmkwin/kwinrules/kwinsrc.cpp index 38f48e003..fb901efb6 100644 --- a/kwin/kcmkwin/kwinrules/kwinsrc.cpp +++ b/kwin/kcmkwin/kwinrules/kwinsrc.cpp @@ -1,4 +1,4 @@ -// Include some code from kwin core in order to avoid +// Include some code from twin core in order to avoid // double implementation. #include "ruleslist.h" diff --git a/kwin/kcmkwin/kwinrules/main.cpp b/kwin/kcmkwin/kwinrules/main.cpp index 4ed26a9e6..db3a9fc48 100644 --- a/kwin/kcmkwin/kwinrules/main.cpp +++ b/kwin/kcmkwin/kwinrules/main.cpp @@ -21,7 +21,7 @@ #include <dcopclient.h> #include <kconfig.h> #include <klocale.h> -#include <kwin.h> +#include <twin.h> #include <X11/Xlib.h> #include <fixx11h.h> @@ -34,7 +34,7 @@ namespace KWinInternal static void loadRules( TQValueList< Rules* >& rules ) { - KConfig cfg( "kwinrulesrc", true ); + KConfig cfg( "twinrulesrc", true ); cfg.setGroup( "General" ); int count = cfg.readNumEntry( "count" ); for( int i = 1; @@ -49,7 +49,7 @@ static void loadRules( TQValueList< Rules* >& rules ) static void saveRules( const TQValueList< Rules* >& rules ) { - KConfig cfg( "kwinrulesrc" ); + KConfig cfg( "twinrulesrc" ); TQStringList groups = cfg.groupList(); for( TQStringList::ConstIterator it = groups.begin(); it != groups.end(); @@ -258,7 +258,7 @@ static int edit( Window wid, bool whole_app ) saveRules( rules ); if( !kapp->dcopClient()->isAttached()) kapp->dcopClient()->attach(); - kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); + kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); return 0; } @@ -275,8 +275,8 @@ static const KCmdLineOptions options[] = extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] ) { - KLocale::setMainCatalogue( "kcmkwinrules" ); - KCmdLineArgs::init( argc, argv, "kwin_rules_dialog", I18N_NOOP( "KWin" ), + KLocale::setMainCatalogue( "kcmtwinrules" ); + KCmdLineArgs::init( argc, argv, "twin_rules_dialog", I18N_NOOP( "KWin" ), I18N_NOOP( "KWin helper utility" ), "1.0" ); KCmdLineArgs::addCmdLineOptions( options ); KApplication app; diff --git a/kwin/kcmkwin/kwinrules/ruleslist.cpp b/kwin/kcmkwin/kwinrules/ruleslist.cpp index e525e472f..29e02549d 100644 --- a/kwin/kcmkwin/kwinrules/ruleslist.cpp +++ b/kwin/kcmkwin/kwinrules/ruleslist.cpp @@ -150,7 +150,7 @@ void KCMRulesList::load() ++it ) delete *it; rules.clear(); - KConfig cfg( "kwinrulesrc", true ); + KConfig cfg( "twinrulesrc", true ); cfg.setGroup( "General" ); int count = cfg.readNumEntry( "count" ); rules.reserve( count ); @@ -171,7 +171,7 @@ void KCMRulesList::load() void KCMRulesList::save() { - KConfig cfg( "kwinrulesrc" ); + KConfig cfg( "twinrulesrc" ); TQStringList groups = cfg.groupList(); for( TQStringList::ConstIterator it = groups.begin(); it != groups.end(); diff --git a/kwin/kcmkwin/kwinrules/ruleswidget.cpp b/kwin/kcmkwin/kwinrules/ruleswidget.cpp index 7a82a8149..cfe96458e 100644 --- a/kwin/kcmkwin/kwinrules/ruleswidget.cpp +++ b/kwin/kcmkwin/kwinrules/ruleswidget.cpp @@ -24,7 +24,7 @@ #include <tqcheckbox.h> #include <kpushbutton.h> #include <tqlabel.h> -#include <kwinmodule.h> +#include <twinmodule.h> #include <klocale.h> #include <tqregexp.h> #include <tqwhatsthis.h> diff --git a/kwin/kcmkwin/kwinrules/ruleswidget.h b/kwin/kcmkwin/kwinrules/ruleswidget.h index b47ad88ab..2a9b0d036 100644 --- a/kwin/kcmkwin/kwinrules/ruleswidget.h +++ b/kwin/kcmkwin/kwinrules/ruleswidget.h @@ -21,7 +21,7 @@ #define __RULESWIDGET_H__ #include <kdialogbase.h> -#include <kwin.h> +#include <twin.h> #include <kshortcutdialog.h> #include "ruleswidgetbase.h" diff --git a/kwin/killer/CMakeLists.txt b/kwin/killer/CMakeLists.txt index 4fd991d40..5a7b36918 100644 --- a/kwin/killer/CMakeLists.txt +++ b/kwin/killer/CMakeLists.txt @@ -19,9 +19,9 @@ link_directories( ) -##### kwin_killer_helper (executable) ########### +##### twin_killer_helper (executable) ########### -tde_add_executable( kwin_killer_helper +tde_add_executable( twin_killer_helper SOURCES killer.cpp LINK tdeui-shared DESTINATION ${BIN_INSTALL_DIR} diff --git a/kwin/killer/Makefile.am b/kwin/killer/Makefile.am index b55ee7b8c..cd396bde7 100644 --- a/kwin/killer/Makefile.am +++ b/kwin/killer/Makefile.am @@ -1,9 +1,9 @@ INCLUDES = $(all_includes) -bin_PROGRAMS = kwin_killer_helper +bin_PROGRAMS = twin_killer_helper -kwin_killer_helper_SOURCES = killer.cpp -kwin_killer_helper_LDADD = $(LIB_TDEUI) -kwin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +twin_killer_helper_SOURCES = killer.cpp +twin_killer_helper_LDADD = $(LIB_TDEUI) +twin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO diff --git a/kwin/killer/killer.cpp b/kwin/killer/killer.cpp index d348e48ff..716b829cc 100644 --- a/kwin/killer/killer.cpp +++ b/kwin/killer/killer.cpp @@ -28,7 +28,7 @@ DEALINGS IN THE SOFTWARE. #include <kprocess.h> #include <klocale.h> #include <unistd.h> -#include <kwin.h> +#include <twin.h> #include <X11/Xlib.h> static const KCmdLineOptions options[] = @@ -45,8 +45,8 @@ static const KCmdLineOptions options[] = int main( int argc, char* argv[] ) { - KLocale::setMainCatalogue( "kwin" ); // the messages are in kwin's .po file - KCmdLineArgs::init( argc, argv, "kwin_killer_helper", I18N_NOOP( "KWin" ), + KLocale::setMainCatalogue( "twin" ); // the messages are in twin's .po file + KCmdLineArgs::init( argc, argv, "twin_killer_helper", I18N_NOOP( "KWin" ), I18N_NOOP( "KWin helper utility" ), "1.0" ); KCmdLineArgs::addCmdLineOptions( options ); KApplication app; diff --git a/kwin/kwin.kcfg b/kwin/kwin.kcfg index 63749c1f8..4962c1d95 100644 --- a/kwin/kwin.kcfg +++ b/kwin/kwin.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <kcfgfile name="kwinrc" /> + <kcfgfile name="twinrc" /> <group name="Desktops" > <entry key="Name_1" type="String" /> <entry key="Name_2" type="String" /> diff --git a/kwin/kwinbindings.cpp b/kwin/kwinbindings.cpp index 45a927f48..265e5b8e9 100644 --- a/kwin/kwinbindings.cpp +++ b/kwin/kwinbindings.cpp @@ -15,7 +15,7 @@ // some shortcuts have Tarzan-speech like names, they need extra normal human descriptions with DEF2() // the others can use DEF() - keys->insert( "Program:kwin", i18n("System") ); + keys->insert( "Program:twin", i18n("System") ); keys->insert( "Group:Navigation", i18n("Navigation") ); DEF( I18N_NOOP("Walk Through Windows"), ALT+Qt::Key_Tab, ALT+Qt::Key_Tab, slotWalkThroughWindows() ); diff --git a/kwin/layers.cpp b/kwin/layers.cpp index 7f6c90378..773ea2d58 100644 --- a/kwin/layers.cpp +++ b/kwin/layers.cpp @@ -149,7 +149,7 @@ void Workspace::propagateClients( bool propagate_new_clients ) // Stack all windows under the support window. The support window is // not used for anything (besides the NETWM property), and it's not shown, - // but it was lowered after kwin startup. Stacking all clients below + // but it was lowered after twin startup. Stacking all clients below // it ensures that no client will be ever shown above override-redirect // windows (e.g. popups). #if 0 @@ -717,7 +717,7 @@ bool Workspace::keepTransientAbove( const Client* mainwindow, const Client* tran return false; // This is rather a hack for #76026. Don't keep non-modal dialogs above // the mainwindow, but only if they're group transient (since only such dialogs - // have taskbar entry in Kicker). A proper way of doing this (both kwin and kicker) + // have taskbar entry in Kicker). A proper way of doing this (both twin and kicker) // needs to be found. if( transient->isDialog() && !transient->isModal() && transient->groupTransient()) return false; diff --git a/kwin/lib/Makefile.am b/kwin/lib/Makefile.am index 1ded5c5d8..af19b7df3 100644 --- a/kwin/lib/Makefile.am +++ b/kwin/lib/Makefile.am @@ -1,4 +1,4 @@ -# FRAME libkwin??? +# FRAME libtwin??? lib_LTLIBRARIES = libtdecorations.la libtdecorations_la_SOURCES = kdecoration.cpp kdecoration_p.cpp kdecoration_plugins_p.cpp \ @@ -16,5 +16,5 @@ METASOURCES = AUTO include ../../admin/Doxyfile.am messages: rc.cpp - $(XGETTEXT) `find . -name \*.cpp` -o $(podir)/kwin_lib.pot + $(XGETTEXT) `find . -name \*.cpp` -o $(podir)/twin_lib.pot -rm rc.cpp diff --git a/kwin/lib/kdecoration.h b/kwin/lib/kdecoration.h index 37dc3f69a..ae3c58e28 100644 --- a/kwin/lib/kdecoration.h +++ b/kwin/lib/kdecoration.h @@ -582,7 +582,7 @@ class KWIN_EXPORT KDecoration // mustn't do any repaints, resizes or anything like that virtual void borders( int& left, int& right, int& top, int& bottom ) const = 0; /** - * This method is called by kwin when the style should resize the decoration window. + * This method is called by twin when the style should resize the decoration window. * The usual implementation is to resize the main widget of the decoration to the * given size. * diff --git a/kwin/lib/kdecoration_plugins_p.cpp b/kwin/lib/kdecoration_plugins_p.cpp index 0490e4755..a7b12ab85 100644 --- a/kwin/lib/kdecoration_plugins_p.cpp +++ b/kwin/lib/kdecoration_plugins_p.cpp @@ -42,7 +42,7 @@ KDecorationPlugins::KDecorationPlugins( KConfig* cfg ) fact( NULL ), old_library( NULL ), old_fact( NULL ), - pluginStr( "kwin3_undefined " ), + pluginStr( "twin3_undefined " ), config( cfg ) { } @@ -98,9 +98,9 @@ bool KDecorationPlugins::loadPlugin( TQString nameStr ) KConfigGroupSaver saver( config, "Style" ); nameStr = config->readEntry("PluginLib", defaultPlugin ); } - // make sure people can switch between HEAD and kwin_iii branch - if( nameStr.startsWith( "kwin_" )) - nameStr = "kwin3_" + nameStr.mid( 5 ); + // make sure people can switch between HEAD and twin_iii branch + if( nameStr.startsWith( "twin_" )) + nameStr = "twin3_" + nameStr.mid( 5 ); KLibrary *oldLibrary = library; KDecorationFactory* oldFactory = fact; @@ -114,7 +114,7 @@ bool KDecorationPlugins::loadPlugin( TQString nameStr ) path = KLibLoader::findLibrary(TQFile::encodeName(nameStr)); } - // If no library was found, exit kwin with an error message + // If no library was found, exit twin with an error message if (path.isEmpty()) { error( i18n("No window decoration plugin library was found." )); @@ -167,14 +167,14 @@ bool KDecorationPlugins::loadPlugin( TQString nameStr ) // For clients in kdeartwork TQString catalogue = nameStr; - catalogue.replace( "kwin3_", "kwin_" ); + catalogue.replace( "twin3_", "twin_" ); KGlobal::locale()->insertCatalogue( catalogue ); // For KCommonDecoration based clients - KGlobal::locale()->insertCatalogue( "kwin_lib" ); + KGlobal::locale()->insertCatalogue( "twin_lib" ); // For clients in kdebase - KGlobal::locale()->insertCatalogue( "kwin_clients" ); + KGlobal::locale()->insertCatalogue( "twin_clients" ); // For clients in kdeartwork - KGlobal::locale()->insertCatalogue( "kwin_art_clients" ); + KGlobal::locale()->insertCatalogue( "twin_art_clients" ); old_library = oldLibrary; // save for delayed destroying old_fact = oldFactory; diff --git a/kwin/main.cpp b/kwin/main.cpp index efd788ad6..c30dc3601 100644 --- a/kwin/main.cpp +++ b/kwin/main.cpp @@ -60,7 +60,7 @@ int x11ErrorHandler(Display *d, XErrorEvent *e) ) && (e->error_code == BadAccess)) { - fputs(i18n("kwin: it looks like there's already a window manager running. kwin not started.\n").local8Bit(), stderr); + fputs(i18n("twin: it looks like there's already a window manager running. twin not started.\n").local8Bit(), stderr); exit(1); } @@ -71,11 +71,11 @@ int x11ErrorHandler(Display *d, XErrorEvent *e) sprintf(number, "%d", e->request_code); XGetErrorDatabaseText(d, "XRequest", number, "<unknown>", req, sizeof(req)); - fprintf(stderr, "kwin: %s(0x%lx): %s\n", req, e->resourceid, msg); + fprintf(stderr, "twin: %s(0x%lx): %s\n", req, e->resourceid, msg); if (initting) { - fputs(i18n("kwin: failure during initialization; aborting").local8Bit(), stderr); + fputs(i18n("twin: failure during initialization; aborting").local8Bit(), stderr); exit(1); } return 0; @@ -116,9 +116,9 @@ Application::Application( ) int format; unsigned long n, left; unsigned char *data; - Atom kwinRunningAtom = XInternAtom (dpy, "_KDE_WM_IS_KWIN", True); + Atom twinRunningAtom = XInternAtom (dpy, "_KDE_WM_IS_KWIN", True); - int result = XGetWindowProperty (dpy, w, kwinRunningAtom, 0L, 1L, False, + int result = XGetWindowProperty (dpy, w, twinRunningAtom, 0L, 1L, False, XA_ATOM, &actual, &format, &n, &left, &data); @@ -129,25 +129,25 @@ Application::Application( ) XFree ( (void *) data); if( !owner.claim( true, true )) { - fputs(i18n("kwin: unable to claim manager selection, another wm running? (try using --replace)\n").local8Bit(), stderr); + fputs(i18n("twin: unable to claim manager selection, another wm running? (try using --replace)\n").local8Bit(), stderr); ::exit(1); } } else { - fputs(i18n("kwin: unable to claim manager selection, another wm running? (try using --replace)\n").local8Bit(), stderr); + fputs(i18n("twin: unable to claim manager selection, another wm running? (try using --replace)\n").local8Bit(), stderr); ::exit(1); } } else { - fputs(i18n("kwin: unable to claim manager selection, another wm running? (try using --replace)\n").local8Bit(), stderr); + fputs(i18n("twin: unable to claim manager selection, another wm running? (try using --replace)\n").local8Bit(), stderr); ::exit(1); } } connect( &owner, TQT_SIGNAL( lostOwnership()), TQT_SLOT( lostSelection())); - // if there was already kwin running, it saved its configuration after loosing the selection -> reread + // if there was already twin running, it saved its configuration after loosing the selection -> reread config()->reparseConfiguration(); initting = TRUE; // startup.... @@ -253,7 +253,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] ) if (! restored) { // we only do the multihead fork if we are not restored by the session - // manager, since the session manager will register multiple kwins, + // manager, since the session manager will register multiple twins, // one for each screen... TQCString multiHead = getenv("KDE_MULTIHEAD"); if (multiHead.lower() == "true") @@ -282,7 +282,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] ) { for (int i = 0; i < number_of_screens; i++ ) { - // if execution doesn't pass by here, then kwin + // if execution doesn't pass by here, then twin // acts exactly as previously if ( i != KWinInternal::screen_number && fork() == 0 ) { @@ -307,9 +307,9 @@ KDE_EXPORT int kdemain( int argc, char * argv[] ) } } - KGlobal::locale()->setMainCatalogue("kwin"); + KGlobal::locale()->setMainCatalogue("twin"); - KAboutData aboutData( "kwin", I18N_NOOP("KWin"), + KAboutData aboutData( "twin", I18N_NOOP("KWin"), version, description, KAboutData::License_GPL, I18N_NOOP("(c) 1999-2005, The KDE Developers")); aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org"); @@ -336,9 +336,9 @@ KDE_EXPORT int kdemain( int argc, char * argv[] ) TQCString appname; if (KWinInternal::screen_number == 0) - appname = "kwin"; + appname = "twin"; else - appname.sprintf("kwin-screen-%d", KWinInternal::screen_number); + appname.sprintf("twin-screen-%d", KWinInternal::screen_number); DCOPClient* client = a.dcopClient(); client->registerAs( appname.data(), false); diff --git a/kwin/oldheaders/CMakeLists.txt b/kwin/oldheaders/CMakeLists.txt index fa5995850..d14ace573 100644 --- a/kwin/oldheaders/CMakeLists.txt +++ b/kwin/oldheaders/CMakeLists.txt @@ -10,5 +10,5 @@ ################################################# install( FILES - options.h client.h workspace.h kwinbutton.h - DESTINATION ${INCLUDE_INSTALL_DIR}/kwin ) + options.h client.h workspace.h twinbutton.h + DESTINATION ${INCLUDE_INSTALL_DIR}/twin ) diff --git a/kwin/oldheaders/Makefile.am b/kwin/oldheaders/Makefile.am index 2dd570c5f..7076d9e13 100644 --- a/kwin/oldheaders/Makefile.am +++ b/kwin/oldheaders/Makefile.am @@ -1,2 +1,2 @@ -kwin_kwinincludedir = $(includedir)/kwin -kwin_kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h +twin_twinincludedir = $(includedir)/twin +twin_twininclude_HEADERS = options.h client.h workspace.h twinbutton.h diff --git a/kwin/oldheaders/client.h b/kwin/oldheaders/client.h index 89db145b2..cff5cdb61 100644 --- a/kwin/oldheaders/client.h +++ b/kwin/oldheaders/client.h @@ -1,4 +1,4 @@ #error The KWin decorations API provided by this header file is obsolete. #error All code using it will have to be ported to the new KDecoration API. -// See kdebase/kwin/clients/PORTING . +// See kdebase/twin/clients/PORTING . diff --git a/kwin/oldheaders/kwinbutton.h b/kwin/oldheaders/kwinbutton.h index 89db145b2..cff5cdb61 100644 --- a/kwin/oldheaders/kwinbutton.h +++ b/kwin/oldheaders/kwinbutton.h @@ -1,4 +1,4 @@ #error The KWin decorations API provided by this header file is obsolete. #error All code using it will have to be ported to the new KDecoration API. -// See kdebase/kwin/clients/PORTING . +// See kdebase/twin/clients/PORTING . diff --git a/kwin/oldheaders/options.h b/kwin/oldheaders/options.h index 89db145b2..cff5cdb61 100644 --- a/kwin/oldheaders/options.h +++ b/kwin/oldheaders/options.h @@ -1,4 +1,4 @@ #error The KWin decorations API provided by this header file is obsolete. #error All code using it will have to be ported to the new KDecoration API. -// See kdebase/kwin/clients/PORTING . +// See kdebase/twin/clients/PORTING . diff --git a/kwin/oldheaders/workspace.h b/kwin/oldheaders/workspace.h index 89db145b2..cff5cdb61 100644 --- a/kwin/oldheaders/workspace.h +++ b/kwin/oldheaders/workspace.h @@ -1,4 +1,4 @@ #error The KWin decorations API provided by this header file is obsolete. #error All code using it will have to be ported to the new KDecoration API. -// See kdebase/kwin/clients/PORTING . +// See kdebase/twin/clients/PORTING . diff --git a/kwin/pics/CMakeLists.txt b/kwin/pics/CMakeLists.txt index 928efb718..e9068f5d9 100644 --- a/kwin/pics/CMakeLists.txt +++ b/kwin/pics/CMakeLists.txt @@ -13,4 +13,4 @@ install( FILES close.png maximize.png maximizedown.png menu.png iconify.png pindown.png pinup.png unknown.png fog.png fog-grey.png bluesun.png greenie.light.png greenie.dim.png - DESTINATION ${DATA_INSTALL_DIR}/kwin/pics ) + DESTINATION ${DATA_INSTALL_DIR}/twin/pics ) diff --git a/kwin/pics/Makefile.am b/kwin/pics/Makefile.am index 8558a612c..29967b69e 100644 --- a/kwin/pics/Makefile.am +++ b/kwin/pics/Makefile.am @@ -1,9 +1,9 @@ -kwin_pics_data_DATA = close.png maximize.png maximizedown.png menu.png \ +twin_pics_data_DATA = close.png maximize.png maximizedown.png menu.png \ iconify.png pindown.png pinup.png unknown.png fog.png \ fog-grey.png bluesun.png greenie.light.png greenie.dim.png -kwin_pics_datadir = $(kde_datadir)/kwin/pics +twin_pics_datadir = $(kde_datadir)/twin/pics -EXTRA_DIST = $(kwin_pics_data_DATA) +EXTRA_DIST = $(twin_pics_data_DATA) diff --git a/kwin/placement.cpp b/kwin/placement.cpp index a9862ce27..84be2e0b8 100644 --- a/kwin/placement.cpp +++ b/kwin/placement.cpp @@ -132,7 +132,7 @@ void Placement::placeSmart(Client* c, const TQRect& area, Policy /*next*/ ) { /* * SmartPlacement by Cristian Tibirna (tibirna@kde.org) - * adapted for kwm (16-19jan98) and for kwin (16Nov1999) using (with + * adapted for kwm (16-19jan98) and for twin (16Nov1999) using (with * permission) ideas from fvwm, authored by * Anthony Martin (amartin@engr.csulb.edu). * Xinerama supported added by Balaji Ramani (balaji@yablibli.com) @@ -435,7 +435,7 @@ void Placement::placeZeroCornered(Client* c, const TQRect& area, Policy /*next*/ void Placement::placeUtility(Client* c, TQRect& area, Policy /*next*/ ) { -// TODO kwin should try to place utility windows next to their mainwindow, +// TODO twin should try to place utility windows next to their mainwindow, // preferably at the right edge, and going down if there are more of them // if there's not enough place outside the mainwindow, it should prefer // top-right corner diff --git a/kwin/plugins.cpp b/kwin/plugins.cpp index 75e7b3498..c1c1a4d40 100644 --- a/kwin/plugins.cpp +++ b/kwin/plugins.cpp @@ -23,7 +23,7 @@ PluginMgr::PluginMgr() : KDecorationPlugins( KGlobal::config()) { defaultPlugin = (TQPixmap::defaultDepth() > 8) ? - "kwin3_plastik" : "kwin3_quartz"; + "twin3_plastik" : "twin3_quartz"; loadPlugin( "" ); // load the plugin specified in cfg file } diff --git a/kwin/rules.cpp b/kwin/rules.cpp index 41489e3cd..f3479f48f 100644 --- a/kwin/rules.cpp +++ b/kwin/rules.cpp @@ -877,7 +877,7 @@ void Client::finishWindowRules() } void Client::checkAndSetInitialRuledOpacity() -//apply kwin-rules for window-translucency upon hitting apply or starting to manage client +//apply twin-rules for window-translucency upon hitting apply or starting to manage client { int tmp; @@ -950,7 +950,7 @@ void Workspace::editWindowRules( Client* c, bool whole_app ) args << "--wid" << TQString::number( c->window()); if( whole_app ) args << "--whole-app"; - KApplication::tdeinitExec( "kwin_rules_dialog", args ); + KApplication::tdeinitExec( "twin_rules_dialog", args ); } void Workspace::loadWindowRules() @@ -960,7 +960,7 @@ void Workspace::loadWindowRules() delete rules.front(); rules.pop_front(); } - KConfig cfg( "kwinrulesrc", true ); + KConfig cfg( "twinrulesrc", true ); cfg.setGroup( "General" ); int count = cfg.readNumEntry( "count" ); for( int i = 1; @@ -976,7 +976,7 @@ void Workspace::loadWindowRules() void Workspace::writeWindowRules() { rulesUpdatedTimer.stop(); - KConfig cfg( "kwinrulesrc" ); + KConfig cfg( "twinrulesrc" ); TQStringList groups = cfg.groupList(); for( TQStringList::ConstIterator it = groups.begin(); it != groups.end(); diff --git a/kwin/rules.h b/kwin/rules.h index 992487e73..061f0ce80 100644 --- a/kwin/rules.h +++ b/kwin/rules.h @@ -30,7 +30,7 @@ namespace KWinInternal class Client; class Rules; -#ifndef KCMRULES // only for kwin core +#ifndef KCMRULES // only for twin core class WindowRules : public KDecorationDefines diff --git a/kwin/tabbox.cpp b/kwin/tabbox.cpp index 19f6560a1..4ca33a04f 100644 --- a/kwin/tabbox.cpp +++ b/kwin/tabbox.cpp @@ -38,7 +38,7 @@ License. See the file "COPYING" for the exact licensing terms. namespace KWinInternal { -extern TQPixmap* kwin_get_menu_pix_hack(); +extern TQPixmap* twin_get_menu_pix_hack(); TabBox::TabBox( Workspace *ws, const char *name ) : TQFrame( 0, name, TQt::WNoAutoErase ), current_client( NULL ), wspace(ws) @@ -375,7 +375,7 @@ void TabBox::drawContents( TQPainter * ) TQPainter p; p.tqbegin(&pix, this); - TQPixmap* menu_pix = kwin_get_menu_pix_hack(); + TQPixmap* menu_pix = twin_get_menu_pix_hack(); int iconWidth = showMiniIcon ? 16 : 32; int x = 0; diff --git a/kwin/tools/decobenchmark/main.cpp b/kwin/tools/decobenchmark/main.cpp index ca3ce11d2..59a6e6762 100644 --- a/kwin/tools/decobenchmark/main.cpp +++ b/kwin/tools/decobenchmark/main.cpp @@ -39,7 +39,7 @@ static KCmdLineOptions options[] = { - { "+decoration", "Decoration library to use, such as kwin3_plastik.", 0 }, + { "+decoration", "Decoration library to use, such as twin3_plastik.", 0 }, { "+tests", "Which test should be executed ('all', 'tqrepaint', 'caption', 'resize', 'recreation')", 0 }, { "+repetitions", "Number of test repetitions.", 0 }, { 0, 0, 0 } @@ -49,10 +49,10 @@ DecoBenchApplication::DecoBenchApplication(const TQString &library, Tests tests, m_tests(tests), m_count(count) { - KConfig kwinConfig("kwinrc"); - kwinConfig.setGroup("Style"); + KConfig twinConfig("twinrc"); + twinConfig.setGroup("Style"); - plugins = new KDecorationPreviewPlugins( &kwinConfig ); + plugins = new KDecorationPreviewPlugins( &twinConfig ); preview = new KDecorationPreview( plugins, 0 ); if (plugins->loadPlugin(library) ) @@ -101,7 +101,7 @@ int main(int argc, char** argv) { TQString style = "keramik"; // KApplication app(argc, argv); - KAboutData about("decobenchmark", "DecoBenchmark", "0.1", "kwin decoration performance tester...", KAboutData::License_LGPL, "(C) 2005 Sandro Giessl"); + KAboutData about("decobenchmark", "DecoBenchmark", "0.1", "twin decoration performance tester...", KAboutData::License_LGPL, "(C) 2005 Sandro Giessl"); KCmdLineArgs::init(argc, argv, &about); KCmdLineArgs::addCmdLineOptions( options ); diff --git a/kwin/tools/decobenchmark/preview.cpp b/kwin/tools/decobenchmark/preview.cpp index 50a12fb24..ec870abe5 100644 --- a/kwin/tools/decobenchmark/preview.cpp +++ b/kwin/tools/decobenchmark/preview.cpp @@ -397,7 +397,7 @@ KDecorationPreviewOptions::~KDecorationPreviewOptions() unsigned long KDecorationPreviewOptions::updateSettings() { - KConfig cfg( "kwinrc", true ); + KConfig cfg( "twinrc", true ); unsigned long changed = 0; changed |= d->updateKWinSettings( &cfg ); diff --git a/kwin/useractions.cpp b/kwin/useractions.cpp index d1b3b1f55..7f7136724 100644 --- a/kwin/useractions.cpp +++ b/kwin/useractions.cpp @@ -258,7 +258,7 @@ void Workspace::initShortcuts() disable_shortcuts_keys = new KGlobalAccel( this ); disable_shortcuts_keys->disableBlocking( true ); #define IN_KWIN -#include "kwinbindings.cpp" +#include "twinbindings.cpp" readShortcuts(); } @@ -1023,7 +1023,7 @@ void Workspace::slotWindowOperations() void Workspace::showWindowMenu( const TQRect &pos, Client* cl ) { - if (!kapp->authorizeKAction("kwin_rmb")) + if (!kapp->authorizeKAction("twin_rmb")) return; if( !cl ) return; diff --git a/kwin/utils.cpp b/kwin/utils.cpp index de422f40e..608b4bed3 100644 --- a/kwin/utils.cpp +++ b/kwin/utils.cpp @@ -47,8 +47,8 @@ namespace KWinInternal // used to store the return values of // XShapeQueryExtension. // Necessary since tqshaped window are an extension to X -int Shape::kwin_tqshape_version = 0; -int Shape::kwin_tqshape_event = 0; +int Shape::twin_tqshape_version = 0; +int Shape::twin_tqshape_event = 0; // does the window w need a tqshape combine mask around it? bool Shape::hasShape( WId w) @@ -66,19 +66,19 @@ bool Shape::hasShape( WId w) int Shape::tqshapeEvent() { - return kwin_tqshape_event; + return twin_tqshape_event; } void Shape::init() { - kwin_tqshape_version = 0; + twin_tqshape_version = 0; int dummy; - if( !XShapeQueryExtension(qt_xdisplay(), &kwin_tqshape_event, &dummy)) + if( !XShapeQueryExtension(qt_xdisplay(), &twin_tqshape_event, &dummy)) return; int major, minor; if( !XShapeQueryVersion( qt_xdisplay(), &major, &minor )) return; - kwin_tqshape_version = major * 0x10 + minor; + twin_tqshape_version = major * 0x10 + minor; } void Motif::readFlags( WId w, bool& noborder, bool& resize, bool& move, @@ -263,7 +263,7 @@ void updateXTime() if ( !w ) w = new TQWidget; long data = 1; - XChangeProperty(qt_xdisplay(), w->winId(), atoms->kwin_running, atoms->kwin_running, 32, + XChangeProperty(qt_xdisplay(), w->winId(), atoms->twin_running, atoms->twin_running, 32, PropModeAppend, (unsigned char*) &data, 1); next_x_time = CurrentTime; XEvent dummy; diff --git a/kwin/utils.h b/kwin/utils.h index 4521eeaa7..e8271e174 100644 --- a/kwin/utils.h +++ b/kwin/utils.h @@ -111,14 +111,14 @@ enum ShadeMode class Shape { public: - static bool available() { return kwin_tqshape_version > 0; } - static int version() { return kwin_tqshape_version; } // as 16*major+minor, i.e. two hex digits + static bool available() { return twin_tqshape_version > 0; } + static int version() { return twin_tqshape_version; } // as 16*major+minor, i.e. two hex digits static bool hasShape( WId w); static int tqshapeEvent(); static void init(); private: - static int kwin_tqshape_version; - static int kwin_tqshape_event; + static int twin_tqshape_version; + static int twin_tqshape_event; }; // compile with XShape older than 1.0 diff --git a/kwin/workspace.cpp b/kwin/workspace.cpp index 06b8bdc8a..44045838c 100644 --- a/kwin/workspace.cpp +++ b/kwin/workspace.cpp @@ -193,8 +193,8 @@ Workspace::Workspace( bool restore ) XChangeProperty( qt_xdisplay(), qt_xrootwin(), - atoms->kwin_running, - atoms->kwin_running, + atoms->twin_running, + atoms->twin_running, 32, PropModeAppend, (unsigned char*) &data, @@ -501,7 +501,7 @@ Workspace::~Workspace() delete kompmgr; blockStackingUpdates( true ); // TODO grabXServer(); - // use stacking_order, so that kwin --replace keeps stacking order + // use stacking_order, so that twin --replace keeps stacking order for( ClientList::ConstIterator it = stacking_order.begin(); it != stacking_order.end(); ++it ) @@ -519,7 +519,7 @@ Workspace::~Workspace() delete popupinfo; delete popup; if ( root == qt_xrootwin() ) - XDeleteProperty(qt_xdisplay(), qt_xrootwin(), atoms->kwin_running); + XDeleteProperty(qt_xdisplay(), qt_xrootwin(), atoms->twin_running); writeWindowRules(); KGlobal::config()->sync(); @@ -1209,11 +1209,11 @@ void Workspace::saveDesktopSettings() TQStringList Workspace::configModules(bool controlCenter) { TQStringList args; - args << "kde-kwindecoration.desktop"; + args << "kde-twindecoration.desktop"; if (controlCenter) - args << "kde-kwinoptions.desktop"; - else if (kapp->authorizeControlModule("kde-kwinoptions.desktop")) - args << "kwinactions" << "kwinfocus" << "kwinmoving" << "kwinadvanced" << "kwinrules" << "kwintranslucency"; + args << "kde-twinoptions.desktop"; + else if (kapp->authorizeControlModule("kde-twinoptions.desktop")) + args << "twinactions" << "twinfocus" << "twinmoving" << "twinadvanced" << "twinrules" << "twintranslucency"; return args; } @@ -2670,11 +2670,11 @@ void Workspace::helperDialog( const TQString& message, const Client* c ) proc << "kdialog" << args; if( !type.isEmpty()) { - KConfig cfg( "kwin_dialogsrc" ); + KConfig cfg( "twin_dialogsrc" ); cfg.setGroup( "Notification Messages" ); // this depends on KMessageBox if( !cfg.readBoolEntry( type, true )) // has don't show again checked return; // save launching kdialog - proc << "--dontagain" << "kwin_dialogsrc:" + type; + proc << "--dontagain" << "twin_dialogsrc:" + type; } if( c != NULL ) proc << "--embed" << TQString::number( c->window()); @@ -2928,7 +2928,7 @@ void Workspace::setShowingDesktop( bool showing ) // A new window resets the state and shows the windows again, with the new window // being active. Due to popular demand (#67406) by people who apparently // don't see a difference between "show desktop" and "minimize all", this is not -// true if "showDesktopIsMinimizeAll" is set in kwinrc. In such case showing +// true if "showDesktopIsMinimizeAll" is set in twinrc. In such case showing // a new window resets the state but doesn't show windows. void Workspace::resetShowingDesktop( bool keep_hidden ) { @@ -2974,14 +2974,14 @@ void Workspace::disableGlobalShortcutsForClient( bool disable ) if( disable ) pending_dfc = true; KIPC::sendMessageAll( KIPC::BlockShortcuts, disable ); - // kwin will get the kipc message too + // twin will get the kipc message too } } void Workspace::disableGlobalShortcuts( bool disable ) { KIPC::sendMessageAll( KIPC::BlockShortcuts, disable ); - // kwin will get the kipc message too + // twin will get the kipc message too } void Workspace::kipcMessage( int id, int data ) diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp index e10aa08a2..291e3e13b 100644 --- a/kxkb/kxkb.cpp +++ b/kxkb/kxkb.cpp @@ -38,8 +38,8 @@ DESCRIPTION #include <kglobalaccel.h> #include <klocale.h> #include <kprocess.h> -#include <kwinmodule.h> -#include <kwin.h> +#include <twinmodule.h> +#include <twin.h> #include <ktempfile.h> #include <kstandarddirs.h> #include <kipc.h> diff --git a/kxkb/layoutmap.h b/kxkb/layoutmap.h index 4be4cdfb2..7b0ebad61 100644 --- a/kxkb/layoutmap.h +++ b/kxkb/layoutmap.h @@ -18,7 +18,7 @@ #include <tqptrqueue.h> #include <tqmap.h> -#include <kwinmodule.h> +#include <twinmodule.h> #include <kdebug.h> #include "kxkbconfig.h" @@ -486,13 +486,13 @@ if test "$kpersonalizerrc_general_firstlogin" = "true"; then # start only dcopserver, don't start whole tdeinit (takes too long) echo "[startkde] Running kpersonalizer..." 1>&2 dcopserver - kwin --lock & + twin --lock & kpersonalizer --before-session # handle kpersonalizer restarts (language change) while test $? -eq 1; do kpersonalizer --r --before-session done - dcopquit kwin + dcopquit twin dcopserver_shutdown --wait fi fi @@ -568,8 +568,8 @@ fi # Finally, give the session control to the session manager. # See kdebase/ksmserver for the description of the rest of the startup sequence. # If the KDEWM environment variable has been set, then it will be used as Trinity's -# window manager instead of kwin. -# If KDEWM is not set, ksmserver will ensure kwin is started. +# window manager instead of twin. +# If KDEWM is not set, ksmserver will ensure twin is started. # kwrapper is used to reduce startup time and memory usage # kwrapper does not return usefull error codes such as the exit code of ksmserver. # We only check for 255 which means that the ksmserver process could not be diff --git a/tdeprint/kjobviewer/kjobviewer.cpp b/tdeprint/kjobviewer/kjobviewer.cpp index 0fb23e7ba..cde28c249 100644 --- a/tdeprint/kjobviewer/kjobviewer.cpp +++ b/tdeprint/kjobviewer/kjobviewer.cpp @@ -32,7 +32,7 @@ #include <kdebug.h> #include <kiconloader.h> #include <kpopupmenu.h> -#include <kwin.h> +#include <twin.h> #include <kstartupinfo.h> class JobTray : public KSystemTray diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp index c1b1b1a0d..171077eea 100644 --- a/tdeprint/tdeprintfax/faxctrl.cpp +++ b/tdeprint/tdeprintfax/faxctrl.cpp @@ -43,7 +43,7 @@ #include <kmimetype.h> #include <kstandarddirs.h> #include <kapplication.h> -#include <kwin.h> +#include <twin.h> #include <kemailsettings.h> #include <kdebug.h> #include <kstdguiitem.h> diff --git a/tqt3integration/module/module.cpp b/tqt3integration/module/module.cpp index ff079c736..600becf61 100644 --- a/tqt3integration/module/module.cpp +++ b/tqt3integration/module/module.cpp @@ -28,7 +28,7 @@ #include <kglobalsettings.h> #include <klocale.h> #include <krecentdocument.h> -#include <kwin.h> +#include <twin.h> #include <tqtimer.h> #include <stdlib.h> #include <unistd.h> |