Rename kwin to twin (part 1 of 2)

pull/2/head
Timothy Pearson 13 years ago
parent 6354e6b3ba
commit 43d99cc247

@ -87,7 +87,7 @@ option( BUILD_DOC "Build doc" ${BUILD_ALL} )
option( BUILD_LIBKONQ "Build libkonq" ${BUILD_ALL} ) option( BUILD_LIBKONQ "Build libkonq" ${BUILD_ALL} )
option( BUILD_KCMINIT "Build kcminit" ${BUILD_ALL} ) option( BUILD_KCMINIT "Build kcminit" ${BUILD_ALL} )
option( BUILD_KCONTROL "Build kcontrol" ${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_KATE "Build kate" ${BUILD_ALL} )
option( BUILD_KONQUEROR "Build konqueror" ${BUILD_ALL} ) option( BUILD_KONQUEROR "Build konqueror" ${BUILD_ALL} )
option( BUILD_KIOSLAVES "Build kioslaves" ${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_LIBKONQ libkonq )
tde_conditional_add_subdirectory( BUILD_KCMINIT kcminit ) tde_conditional_add_subdirectory( BUILD_KCMINIT kcminit )
add_subdirectory( kcontrol ) 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_KATE kate )
tde_conditional_add_subdirectory( BUILD_KONQUEROR konqueror ) tde_conditional_add_subdirectory( BUILD_KONQUEROR konqueror )
tde_conditional_add_subdirectory( BUILD_KIOSLAVES kioslave ) tde_conditional_add_subdirectory( BUILD_KIOSLAVES kioslave )

@ -44,7 +44,7 @@ if( WITH_HAL )
endif( ) 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 ) if( WITH_XRENDER OR BUILD_KDESKTOP OR BUILD_KONSOLE OR BUILD_KCONTROL OR BUILD_KICKER )
pkg_search_module( XRENDER xrender ) pkg_search_module( XRENDER xrender )
if( XRENDER_FOUND ) if( XRENDER_FOUND )
@ -66,7 +66,7 @@ if( WITH_XCURSOR )
endif( ) endif( )
# xcomposite (kicker, kwin) # xcomposite (kicker, twin)
if( WITH_XCOMPOSITE ) if( WITH_XCOMPOSITE )
pkg_search_module( XCOMPOSITE xcomposite ) pkg_search_module( XCOMPOSITE xcomposite )
if( XCOMPOSITE_FOUND ) if( XCOMPOSITE_FOUND )
@ -88,7 +88,7 @@ if( WITH_XFIXES )
endif( ) endif( )
# xdamage (kwin/kompmgr) # xdamage (twin/kompmgr)
if( WITH_XDAMAGE ) if( WITH_XDAMAGE )
pkg_search_module( XDAMAGE xdamage ) pkg_search_module( XDAMAGE xdamage )
if( NOT XDAMAGE_FOUND ) if( NOT XDAMAGE_FOUND )
@ -97,7 +97,7 @@ if( WITH_XDAMAGE )
endif( ) endif( )
# xext (kwin/kompmgr) # xext (twin/kompmgr)
if( WITH_XEXT ) if( WITH_XEXT )
pkg_search_module( XEXT xext ) pkg_search_module( XEXT xext )
if( NOT XEXT_FOUND ) if( NOT XEXT_FOUND )

@ -133,7 +133,7 @@ libraries. Here is an overview of the directories:
* ktip * ktip
Gives you tips how to use KDE. Gives you tips how to use KDE.
* kwin * twin
The KDE window manager (moves, resizes and decorates windows). The KDE window manager (moves, resizes and decorates windows).
* kxkb * kxkb

@ -45,7 +45,7 @@ particular the &gcc; compiler.</para>
</question> </question>
<answer> <answer>
<para>No, &kde; is not a window manager. While &kde; includes a very <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> It is a full-blown Integrated Desktop Environment.</para>
<para>&kde; provides a complete desktop environment, including a web <para>&kde; provides a complete desktop environment, including a web
browser, a file manager, a window manager, a help system, a browser, a file manager, a window manager, a help system, a

@ -15,7 +15,7 @@
<para>Does &kde; support transparency and other visual effects provided by the new composite extension to X.org?</para> <para>Does &kde; support transparency and other visual effects provided by the new composite extension to X.org?</para>
</question> </question>
<answer> <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> <screen>
Section "Extensions" Section "Extensions"

@ -10,14 +10,14 @@
<title>The window manager</title> <title>The window manager</title>
<para>The default window manager provided by &kde; is the K Window <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 K Window Manager Handbook</quote> (which should be accessible from the
<application>&kde; Help Center</application>) for usage information.</para> <application>&kde; Help Center</application>) for usage information.</para>
<qandaset> <qandaset>
<qandaentry> <qandaentry>
<question> <question>
<para>Are there keyboard shortcuts for &kwin; operations?</para> <para>Are there keyboard shortcuts for &twin; operations?</para>
</question> </question>
<answer> <answer>
<para>Yes. Please refer to "The K Window Manager Handbook" for the <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>
<listitem> <listitem>
<para>If you click the &MMB; on the root window (&ie;, <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> of all available tasks.</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>

@ -9,4 +9,4 @@
# #
################################################# #################################################
tde_create_handbook( DESTINATION kcontrol/kwindecoration ) tde_create_handbook( DESTINATION kcontrol/twindecoration )

@ -1,2 +1,2 @@
KDE_LANG = en KDE_LANG = en
KDE_DOCS = kcontrol/kwindecoration KDE_DOCS = kcontrol/twindecoration

@ -19,7 +19,7 @@
<keywordset> <keywordset>
<keyword>KDE</keyword> <keyword>KDE</keyword>
<keyword>KControl</keyword> <keyword>KControl</keyword>
<keyword>kwin</keyword> <keyword>twin</keyword>
<keyword>window</keyword> <keyword>window</keyword>
<keyword>border</keyword> <keyword>border</keyword>
<keyword>theme</keyword> <keyword>theme</keyword>

@ -32,7 +32,7 @@ some windows.</para>
<note> <note>
<para>Please note that this configuration will not take effect if you <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 manager, please refer to its documentation for how to customize
window behavior.</para> window behavior.</para>
</note> </note>

@ -1,7 +1,7 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kappname "kompmgr"> <!ENTITY kappname "kompmgr">
<!ENTITY package "kwin"> <!ENTITY package "twin">
<!ENTITY % English "INCLUDE"> <!ENTITY % English "INCLUDE">
<!ENTITY % addindex "IGNORE"> <!ENTITY % addindex "IGNORE">
]> ]>
@ -30,7 +30,7 @@
<releaseinfo>2.0.1</releaseinfo> <releaseinfo>2.0.1</releaseinfo>
<abstract> <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, <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 how it works and what the restrictions are than a documentation how to use
it (as it works in the background automatically).</para> it (as it works in the background automatically).</para>
@ -38,7 +38,7 @@ it (as it works in the background automatically).</para>
<keywordset> <keywordset>
<keyword>KDE</keyword> <keyword>KDE</keyword>
<keyword>kwin</keyword> <keyword>twin</keyword>
<keyword>render engine</keyword> <keyword>render engine</keyword>
</keywordset> </keywordset>
</bookinfo> </bookinfo>

@ -252,7 +252,7 @@ mouse buttons.</para>
<term><guilabel>Window Behavior</guilabel></term> <term><guilabel>Window Behavior</guilabel></term>
<listitem> <listitem>
<para>This is where you would configure options related to the behavior of <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 advanced features such as focus stealing prevention and different focus
policies such as focus follows mouse. You can also configure what actions policies such as focus follows mouse. You can also configure what actions
you would like to bind to certain keys and mouse events.</para> you would like to bind to certain keys and mouse events.</para>

@ -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 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 decorations come in source code that must be compiled, or as binary packages
that must be installed. Basically, Window decorations are plugins or small 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> how to display window frames.</para>
<para>In order to add a new window decoration, you need to compile it from <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 <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 the <guilabel>Open &kde;'s IceWM theme folder</guilabel> link in the window
decoration description area. This will open a &konqueror; 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 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 the list of IceWM themes. Select the theme you want to use and click on
<guibutton>Apply</guibutton>.</para> <guibutton>Apply</guibutton>.</para>

@ -1135,7 +1135,7 @@ at the time the session was saved. Sessions are stored in the
references to application-specific state information. The references to application-specific state information. The
application-specific state information is saved in <filename application-specific state information is saved in <filename
class="directory">$<envar>KDEHOME</envar>/share/config/session</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. windows of all the other applications in the session.
</para> </para>
@ -1184,7 +1184,7 @@ class="username">root</systemitem>.</para>
<varlistentry><term>$<envar>KDEWM</envar></term><listitem><para>If the <varlistentry><term>$<envar>KDEWM</envar></term><listitem><para>If the
<envar>KDEWM</envar> environment variable has been set, then it will <envar>KDEWM</envar> environment variable has been set, then it will
be used as &kde;'s window manager within the 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> </listitem>
</varlistentry> </varlistentry>

@ -381,13 +381,13 @@ the one with the <guiicon>Next Page</guiicon> picture on it.
</step> </step>
<step> <step>
<para>In the <guilabel>Command/URL Settings</guilabel> tab, enter the <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> nextDesktop</command></userinput></para>
</step> </step>
</procedure> </procedure>
<para>Repeat the above with the <keysym>Prev_Virtual_Screen</keysym> key and <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> previousDesktop</command></userinput>.</para>
<para>Now pressing the <keysym>Prev_Virtual_Screen</keysym> or <para>Now pressing the <keysym>Prev_Virtual_Screen</keysym> or

@ -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[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[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[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_CN]=程序在检测到缺陷引起的内部不一致时,以 SIGABRT 信号中止。
Comment[zh_TW]=程式偵測發生到內部錯誤時,以 SIGABRT 信號中止。 Comment[zh_TW]=程式偵測發生到內部錯誤時,以 SIGABRT 信號中止。
Comment[zu]=Umyaleli wekhompyutha unqamuka ngophawu lwe-SIGABRT uma ecosha ukungahambisani kwangaphakathi okubangwe igciwane elisohlelweni lwemisebenzi. Comment[zu]=Umyaleli wekhompyutha unqamuka ngophawu lwe-SIGABRT uma ecosha ukungahambisani kwangaphakathi okubangwe igciwane elisohlelweni lwemisebenzi.

@ -279,7 +279,7 @@
* kateconsole.* konsole/* : add kateconsole widget * kateconsole.* konsole/* : add kateconsole widget
2001-02-16 Anders Lund <anders@alweb.dk> 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> 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 * kateview.cpp : Tab doesn't jump to next widget anymore, but inserts a tab into the text

@ -33,7 +33,7 @@
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <kconfig.h> #include <kconfig.h>
#include <kwin.h> #include <twin.h>
#include <ktip.h> #include <ktip.h>
#include <kdebug.h> #include <kdebug.h>
#include <klibloader.h> #include <klibloader.h>

@ -57,7 +57,7 @@
#include <ksimpleconfig.h> #include <ksimpleconfig.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kwin.h> #include <twin.h>
#include <kseparator.h> #include <kseparator.h>
KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view ) KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )

@ -40,7 +40,7 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kencodingfiledialog.h> #include <kencodingfiledialog.h>
#include <kio/job.h> #include <kio/job.h>
#include <kwin.h> #include <twin.h>
#include <tqdatetime.h> #include <tqdatetime.h>
#include <tqtextcodec.h> #include <tqtextcodec.h>

@ -20,7 +20,7 @@
#include <netwm.h> #include <netwm.h>
#include <kshortcut.h> #include <kshortcut.h>
#include <kkeynative.h> #include <kkeynative.h>
#include <kwin.h> #include <twin.h>
#include <X11/XKBlib.h> #include <X11/XKBlib.h>
#define XK_MISCELLANY #define XK_MISCELLANY

@ -7,7 +7,7 @@
#include <kuniqueapplication.h> #include <kuniqueapplication.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>

@ -38,7 +38,7 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kpixmap.h> #include <kpixmap.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kwin.h> #include <twin.h>
#include "bgrender.h" #include "bgrender.h"
#include "bgadvanced.h" #include "bgadvanced.h"

@ -52,8 +52,8 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kstringhandler.h> #include <kstringhandler.h>
#include <kurlrequester.h> #include <kurlrequester.h>
#include <kwin.h> #include <twin.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <kimagefilepreview.h> #include <kimagefilepreview.h>
#include <knewstuff/downloaddialog.h> #include <knewstuff/downloaddialog.h>
@ -74,10 +74,10 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
m_multidesktop = _multidesktop; m_multidesktop = _multidesktop;
m_previewUpdates = true; m_previewUpdates = true;
KWinModule *m_kwin; KWinModule *m_twin;
m_kwin = new KWinModule(TQT_TQOBJECT(this)); m_twin = new KWinModule(TQT_TQOBJECT(this));
m_curDesk = m_kwin->currentDesktop(); m_curDesk = m_twin->currentDesktop();
TQSize s(m_kwin->numberOfViewports(m_kwin->currentDesktop())); TQSize s(m_twin->numberOfViewports(m_twin->currentDesktop()));
m_useViewports = s.width() * s.height() > 1; m_useViewports = s.width() * s.height() > 1;
m_numDesks = m_multidesktop ? KWin::numberOfDesktops() : 1; m_numDesks = m_multidesktop ? KWin::numberOfDesktops() : 1;
@ -90,12 +90,12 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
m_numScreens = 1; 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()); int t_eViewport = (vx.x() * vx.y());
if (t_eViewport < 1) { if (t_eViewport < 1) {
t_eViewport = 1; t_eViewport = 1;
} }
delete m_kwin; delete m_twin;
m_desk = m_multidesktop ? KWin::currentDesktop() : 1; m_desk = m_multidesktop ? KWin::currentDesktop() : 1;
m_desk = m_multidesktop ? (m_useViewports ? (((m_desk - 1) * m_numViewports) + t_eViewport) : m_desk) : m_desk; m_desk = m_multidesktop ? (m_useViewports ? (((m_desk - 1) * m_numViewports) + t_eViewport) : m_desk) : m_desk;

@ -356,7 +356,7 @@ void WidgetCanvas::drawSampleWidgets()
KPixmap pmTitle; KPixmap pmTitle;
pmTitle.resize( width()-160, 20 ); 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. // use the gradient have it vertical.
KPixmapEffect::gradient(pmTitle, iaTitle, iaBlend, KPixmapEffect::gradient(pmTitle, iaTitle, iaBlend,
KPixmapEffect::HorizontalGradient); KPixmapEffect::HorizontalGradient);
@ -400,7 +400,7 @@ void WidgetCanvas::drawSampleWidgets()
paint.setBrush( aTitle );paint.setPen( aTitle ); paint.setBrush( aTitle );paint.setPen( aTitle );
paint.drawRect( 65, 30+5, width()-152, 20 ); 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. // use the gradient have it vertical.
pmTitle.resize( width()-152, 20 ); pmTitle.resize( width()-152, 20 );
KPixmapEffect::gradient(pmTitle, aTitle, aBlend, KPixmapEffect::gradient(pmTitle, aTitle, aBlend,

@ -26,7 +26,7 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kinstance.h> #include <kinstance.h>
#include <kaction.h> #include <kaction.h>
#include <kwin.h> #include <twin.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klineedit.h> #include <klineedit.h>

@ -61,7 +61,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
// see also KKeyModule::init() below !!! // see also KKeyModule::init() below !!!
#define NOSLOTS #define NOSLOTS
#define KShortcuts KAccelShortcuts #define KShortcuts KAccelShortcuts
#include "../../kwin/kwinbindings.cpp" #include "../../twin/twinbindings.cpp"
#include "../../kicker/kicker/core/kickerbindings.cpp" #include "../../kicker/kicker/core/kickerbindings.cpp"
#include "../../kicker/taskbar/taskbarbindings.cpp" #include "../../kicker/taskbar/taskbarbindings.cpp"
#include "../../kdesktop/kdesktopbindings.cpp" #include "../../kdesktop/kdesktopbindings.cpp"
@ -209,7 +209,7 @@ void KKeyModule::load()
if ( !kapp->dcopClient()->isAttached() ) if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach(); kapp->dcopClient()->attach();
// TODO: create a reconfigureKeys() method. // TODO: create a reconfigureKeys() method.
kapp->dcopClient()->send("kwin", "", "reconfigure()", ""); kapp->dcopClient()->send("twin", "", "reconfigure()", "");
kapp->dcopClient()->send("kdesktop", "", "configure()", ""); kapp->dcopClient()->send("kdesktop", "", "configure()", "");
kapp->dcopClient()->send("kicker", "Panel", "configure()", ""); kapp->dcopClient()->send("kicker", "Panel", "configure()", "");
} }
@ -485,7 +485,7 @@ void KKeyModule::init()
#define NOSLOTS #define NOSLOTS
#define KShortcuts KAccelShortcuts #define KShortcuts KAccelShortcuts
#include "../../klipper/klipperbindings.cpp" #include "../../klipper/klipperbindings.cpp"
#include "../../kwin/kwinbindings.cpp" #include "../../twin/twinbindings.cpp"
#include "../../kicker/kicker/core/kickerbindings.cpp" #include "../../kicker/kicker/core/kickerbindings.cpp"
#include "../../kicker/taskbar/taskbarbindings.cpp" #include "../../kicker/taskbar/taskbarbindings.cpp"
#include "../../kdesktop/kdesktopbindings.cpp" #include "../../kdesktop/kdesktopbindings.cpp"

@ -132,7 +132,7 @@ extern "C"
KDE_EXPORT KCModule *create_keys(TQWidget *parent, const char * /*name*/) 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 // 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("kdesktop");
KGlobal::locale()->insertCatalogue("kicker"); KGlobal::locale()->insertCatalogue("kicker");
return new KeyModule(parent, "kcmkeys"); return new KeyModule(parent, "kcmkeys");
@ -168,7 +168,7 @@ extern "C"
#define CTRL Qt::CTRL #define CTRL Qt::CTRL
#define ALT Qt::ALT #define ALT Qt::ALT
#include "../../klipper/klipperbindings.cpp" #include "../../klipper/klipperbindings.cpp"
#include "../../kwin/kwinbindings.cpp" #include "../../twin/twinbindings.cpp"
#define KICKER_ALL_BINDINGS #define KICKER_ALL_BINDINGS
#include "../../kicker/kicker/core/kickerbindings.cpp" #include "../../kicker/kicker/core/kickerbindings.cpp"
#include "../../kicker/taskbar/taskbarbindings.cpp" #include "../../kicker/taskbar/taskbarbindings.cpp"

@ -111,7 +111,7 @@ void ShortcutsModule::initGUI()
// see also KShortcutsModule::init() below !!! // see also KShortcutsModule::init() below !!!
#define NOSLOTS #define NOSLOTS
#define KICKER_ALL_BINDINGS #define KICKER_ALL_BINDINGS
#include "../../kwin/kwinbindings.cpp" #include "../../twin/twinbindings.cpp"
#include "../../kicker/kicker/core/kickerbindings.cpp" #include "../../kicker/kicker/core/kickerbindings.cpp"
#include "../../kicker/taskbar/taskbarbindings.cpp" #include "../../kicker/taskbar/taskbarbindings.cpp"
#include "../../kdesktop/kdesktopbindings.cpp" #include "../../kdesktop/kdesktopbindings.cpp"

@ -34,7 +34,7 @@
#include <kpanelextension.h> #include <kpanelextension.h>
#include <kpixmap.h> #include <kpixmap.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kwin.h> #include <twin.h>
#include "main.h" #include "main.h"
#include "../background/bgrender.h" #include "../background/bgrender.h"

@ -141,30 +141,30 @@ void KDesktopConfig::load( bool useDefaults )
else else
groupname.sprintf("Desktops-screen-%d", konq_screen_number); 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++) for(int i = 1; i <= maxDesktops; i++)
{ {
TQString key_name(TQString("Name_") + TQString::number(i)); TQString key_name(TQString("Name_") + TQString::number(i));
TQString name = TQString::fromUtf8(info.desktopName(i)); TQString name = TQString::fromUtf8(info.desktopName(i));
if (name.isEmpty()) // Get name from configuration if none is set in the WM. 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); _nameInput[i-1]->setText(name);
// Is this entry immutable or not in the range of configured desktops? // 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]); _nameInput[i-1]->setEnabled(i <= n && !_labelImmutable[i - 1]);
} }
_numInput->setEnabled(!kwinconfig->entryIsImmutable("Number")); _numInput->setEnabled(!twinconfig->entryIsImmutable("Number"));
delete kwinconfig; delete twinconfig;
kwinconfig = 0; twinconfig = 0;
TQString configfile; TQString configfile;
if (konq_screen_number == 0) if (konq_screen_number == 0)

@ -27,7 +27,7 @@ class TQCheckBox;
class KLineEdit; class KLineEdit;
class KIntNumInput; 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; static const int maxDesktops = 20;
class KDesktopConfig : public KCModule class KDesktopConfig : public KCModule

@ -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]=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[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[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[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[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 Keywords[sl]=konqueror,upravitelj datotek,upravljalnik,kfm,namigi,namigi datotek,ločeno okno,ustvari okna,obnašanje,poraba pomnilnika,domači URL

@ -410,7 +410,7 @@ void DesktopBehavior::save()
// for the standalone menubar setting // for the standalone menubar setting
kapp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data ); kapp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data );
kapp->dcopClient()->send( "kicker", "kicker", "configureMenubar()", data ); kapp->dcopClient()->send( "kicker", "kicker", "configureMenubar()", data );
kapp->dcopClient()->send( "kwin*", "", "reconfigure()", data ); kapp->dcopClient()->send( "twin*", "", "reconfigure()", data );
} }
void DesktopBehavior::enableChanged() void DesktopBehavior::enableChanged()

@ -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]=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[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[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[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[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 Keywords[sl]=konqueror,upravitelj datotek,upravljalnik,kfm,namigi,namigi datotek,ločeno okno,ustvari okna,obnašanje,poraba pomnilnika,domači URL

@ -119,7 +119,7 @@ static void applyQtColors( KConfig& kglobals, TQSettings& settings, TQPalette& n
settings.writeEntry("/qt/Palette/inactive", inactcg); settings.writeEntry("/qt/Palette/inactive", inactcg);
settings.writeEntry("/qt/Palette/disabled", discg); 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"); kglobals.setGroup("WM");
// active colors // active colors

@ -121,21 +121,21 @@
<linkColor rgb="#ffffff" object="global" /> <linkColor rgb="#ffffff" object="global" />
<visitedLinkColor rgb="#ffffff" object="global" /> <visitedLinkColor rgb="#ffffff" object="global" />
<alternateBackground rgb="#000028" object="global" /> <alternateBackground rgb="#000028" object="global" />
<activeForeground rgb="#ffffff" object="kwin" /> <activeForeground rgb="#ffffff" object="twin" />
<inactiveBackground rgb="#1e1e1e" object="kwin" /> <inactiveBackground rgb="#1e1e1e" object="twin" />
<inactiveBlend rgb="#1e1e1e" object="kwin" /> <inactiveBlend rgb="#1e1e1e" object="twin" />
<activeBackground rgb="#00005a" object="kwin" /> <activeBackground rgb="#00005a" object="twin" />
<activeBlend rgb="#00005a" object="kwin" /> <activeBlend rgb="#00005a" object="twin" />
<inactiveForeground rgb="#808080" object="kwin" /> <inactiveForeground rgb="#808080" object="twin" />
<activeTitleBtnBg rgb="#ffffff" object="kwin" /> <activeTitleBtnBg rgb="#ffffff" object="twin" />
<inactiveTitleBtnBg rgb="#aaaaaa" object="kwin" /> <inactiveTitleBtnBg rgb="#aaaaaa" object="twin" />
<frame rgb="#000085" object="kwin" /> <frame rgb="#000085" object="twin" />
<inactiveFrame rgb="#1e1e1e" object="kwin" /> <inactiveFrame rgb="#1e1e1e" object="twin" />
<handle rgb="#000085" object="kwin" /> <handle rgb="#000085" object="twin" />
<inactiveHandle rgb="#1e1e1e" object="kwin" /> <inactiveHandle rgb="#1e1e1e" object="twin" />
</colors> </colors>
<cursors name="" /> <cursors name="" />
<wm type="builtin" name="kwin3_plastik" > <wm type="builtin" name="twin3_plastik" >
<border size="3" /> <border size="3" />
</wm> </wm>
<konqueror> <konqueror>

@ -121,21 +121,21 @@
<linkColor rgb="#ffffff" object="global" /> <linkColor rgb="#ffffff" object="global" />
<visitedLinkColor rgb="#ffffff" object="global" /> <visitedLinkColor rgb="#ffffff" object="global" />
<alternateBackground rgb="#000028" object="global" /> <alternateBackground rgb="#000028" object="global" />
<activeForeground rgb="#ffffff" object="kwin" /> <activeForeground rgb="#ffffff" object="twin" />
<inactiveBackground rgb="#1e1e1e" object="kwin" /> <inactiveBackground rgb="#1e1e1e" object="twin" />
<inactiveBlend rgb="#1e1e1e" object="kwin" /> <inactiveBlend rgb="#1e1e1e" object="twin" />
<activeBackground rgb="#00005a" object="kwin" /> <activeBackground rgb="#00005a" object="twin" />
<activeBlend rgb="#00005a" object="kwin" /> <activeBlend rgb="#00005a" object="twin" />
<inactiveForeground rgb="#808080" object="kwin" /> <inactiveForeground rgb="#808080" object="twin" />
<activeTitleBtnBg rgb="#ffffff" object="kwin" /> <activeTitleBtnBg rgb="#ffffff" object="twin" />
<inactiveTitleBtnBg rgb="#aaaaaa" object="kwin" /> <inactiveTitleBtnBg rgb="#aaaaaa" object="twin" />
<frame rgb="#000085" object="kwin" /> <frame rgb="#000085" object="twin" />
<inactiveFrame rgb="#1e1e1e" object="kwin" /> <inactiveFrame rgb="#1e1e1e" object="twin" />
<handle rgb="#000085" object="kwin" /> <handle rgb="#000085" object="twin" />
<inactiveHandle rgb="#1e1e1e" object="kwin" /> <inactiveHandle rgb="#1e1e1e" object="twin" />
</colors> </colors>
<cursors name="" /> <cursors name="" />
<wm type="builtin" name="kwin3_plastik" > <wm type="builtin" name="twin3_plastik" >
<border size="3" /> <border size="3" />
</wm> </wm>
<konqueror> <konqueror>

@ -121,21 +121,21 @@
<linkColor rgb="#000000" object="global" /> <linkColor rgb="#000000" object="global" />
<visitedLinkColor rgb="#000000" object="global" /> <visitedLinkColor rgb="#000000" object="global" />
<alternateBackground rgb="#d7d7ff" object="global" /> <alternateBackground rgb="#d7d7ff" object="global" />
<activeForeground rgb="#000000" object="kwin" /> <activeForeground rgb="#000000" object="twin" />
<inactiveBackground rgb="#e1e1e1" object="kwin" /> <inactiveBackground rgb="#e1e1e1" object="twin" />
<inactiveBlend rgb="#e1e1e1" object="kwin" /> <inactiveBlend rgb="#e1e1e1" object="twin" />
<activeBackground rgb="#a5a5ff" object="kwin" /> <activeBackground rgb="#a5a5ff" object="twin" />
<activeBlend rgb="#a5a5ff" object="kwin" /> <activeBlend rgb="#a5a5ff" object="twin" />
<inactiveForeground rgb="#808080" object="kwin" /> <inactiveForeground rgb="#808080" object="twin" />
<activeTitleBtnBg rgb="#000000" object="kwin" /> <activeTitleBtnBg rgb="#000000" object="twin" />
<inactiveTitleBtnBg rgb="#555555" object="kwin" /> <inactiveTitleBtnBg rgb="#555555" object="twin" />
<frame rgb="#7a7aff" object="kwin" /> <frame rgb="#7a7aff" object="twin" />
<inactiveFrame rgb="#e1e1e1" object="kwin" /> <inactiveFrame rgb="#e1e1e1" object="twin" />
<handle rgb="#7a7aff" object="kwin" /> <handle rgb="#7a7aff" object="twin" />
<inactiveHandle rgb="#e1e1e1" object="kwin" /> <inactiveHandle rgb="#e1e1e1" object="twin" />
</colors> </colors>
<cursors name="" /> <cursors name="" />
<wm type="builtin" name="kwin3_plastik" > <wm type="builtin" name="twin3_plastik" >
<border size="3" /> <border size="3" />
</wm> </wm>
<konqueror> <konqueror>

@ -121,21 +121,21 @@
<linkColor rgb="#000000" object="global" /> <linkColor rgb="#000000" object="global" />
<visitedLinkColor rgb="#000000" object="global" /> <visitedLinkColor rgb="#000000" object="global" />
<alternateBackground rgb="#d7d7ff" object="global" /> <alternateBackground rgb="#d7d7ff" object="global" />
<activeForeground rgb="#000000" object="kwin" /> <activeForeground rgb="#000000" object="twin" />
<inactiveBackground rgb="#e1e1e1" object="kwin" /> <inactiveBackground rgb="#e1e1e1" object="twin" />
<inactiveBlend rgb="#e1e1e1" object="kwin" /> <inactiveBlend rgb="#e1e1e1" object="twin" />
<activeBackground rgb="#a5a5ff" object="kwin" /> <activeBackground rgb="#a5a5ff" object="twin" />
<activeBlend rgb="#a5a5ff" object="kwin" /> <activeBlend rgb="#a5a5ff" object="twin" />
<inactiveForeground rgb="#808080" object="kwin" /> <inactiveForeground rgb="#808080" object="twin" />
<activeTitleBtnBg rgb="#000000" object="kwin" /> <activeTitleBtnBg rgb="#000000" object="twin" />
<inactiveTitleBtnBg rgb="#555555" object="kwin" /> <inactiveTitleBtnBg rgb="#555555" object="twin" />
<frame rgb="#7a7aff" object="kwin" /> <frame rgb="#7a7aff" object="twin" />
<inactiveFrame rgb="#e1e1e1" object="kwin" /> <inactiveFrame rgb="#e1e1e1" object="twin" />
<handle rgb="#7a7aff" object="kwin" /> <handle rgb="#7a7aff" object="twin" />
<inactiveHandle rgb="#e1e1e1" object="kwin" /> <inactiveHandle rgb="#e1e1e1" object="twin" />
</colors> </colors>
<cursors name="" /> <cursors name="" />
<wm type="builtin" name="kwin3_plastik" > <wm type="builtin" name="twin3_plastik" >
<border size="1" /> <border size="1" />
</wm> </wm>
<konqueror> <konqueror>

@ -90,17 +90,17 @@
<buttonForeground rgb="#000000" object="global" /> <buttonForeground rgb="#000000" object="global" />
<linkColor rgb="#0000c0" object="global" /> <linkColor rgb="#0000c0" object="global" />
<visitedLinkColor rgb="#800080" object="global" /> <visitedLinkColor rgb="#800080" object="global" />
<activeForeground rgb="#ffffff" object="kwin" /> <activeForeground rgb="#ffffff" object="twin" />
<inactiveBackground rgb="#dcdcdc" object="kwin" /> <inactiveBackground rgb="#dcdcdc" object="twin" />
<inactiveBlend rgb="#dcdcdc" object="kwin" /> <inactiveBlend rgb="#dcdcdc" object="twin" />
<activeBackground rgb="#0a5f89" object="kwin" /> <activeBackground rgb="#0a5f89" object="twin" />
<activeBlend rgb="#0a5f89" object="kwin" /> <activeBlend rgb="#0a5f89" object="twin" />
<inactiveForeground rgb="#000000" object="kwin" /> <inactiveForeground rgb="#000000" object="twin" />
<activeTitleBtnBg rgb="#c0c0c0" object="kwin" /> <activeTitleBtnBg rgb="#c0c0c0" object="twin" />
<inactiveTitleBtnBg rgb="#a7b5c7" object="kwin" /> <inactiveTitleBtnBg rgb="#a7b5c7" object="twin" />
</colors> </colors>
<cursors name="" /> <cursors name="" />
<wm type="builtin" name="kwin3_default" > <wm type="builtin" name="twin3_default" >
<border size="1" /> <border size="1" />
</wm> </wm>
<konqueror> <konqueror>

@ -90,17 +90,17 @@
<buttonForeground rgb="#000000" object="global" /> <buttonForeground rgb="#000000" object="global" />
<linkColor rgb="#0000c0" object="global" /> <linkColor rgb="#0000c0" object="global" />
<visitedLinkColor rgb="#800080" object="global" /> <visitedLinkColor rgb="#800080" object="global" />
<activeForeground rgb="#ffffff" object="kwin" /> <activeForeground rgb="#ffffff" object="twin" />
<inactiveBackground rgb="#afd6ff" object="kwin" /> <inactiveBackground rgb="#afd6ff" object="twin" />
<inactiveBlend rgb="#afd6ff" object="kwin" /> <inactiveBlend rgb="#afd6ff" object="twin" />
<activeBackground rgb="#3e91eb" object="kwin" /> <activeBackground rgb="#3e91eb" object="twin" />
<activeBlend rgb="#3e91eb" object="kwin" /> <activeBlend rgb="#3e91eb" object="twin" />
<inactiveForeground rgb="#ffffff" object="kwin" /> <inactiveForeground rgb="#ffffff" object="twin" />
<activeTitleBtnBg rgb="#dcdcdc" object="kwin" /> <activeTitleBtnBg rgb="#dcdcdc" object="twin" />
<inactiveTitleBtnBg rgb="#dcdcdc" object="kwin" /> <inactiveTitleBtnBg rgb="#dcdcdc" object="twin" />
</colors> </colors>
<cursors name="" /> <cursors name="" />
<wm type="builtin" name="kwin3_keramik" > <wm type="builtin" name="twin3_keramik" >
<border size="1" /> <border size="1" />
</wm> </wm>
<konqueror> <konqueror>

@ -90,17 +90,17 @@
<buttonForeground rgb="#000000" object="global" /> <buttonForeground rgb="#000000" object="global" />
<linkColor rgb="#0000ee" object="global" /> <linkColor rgb="#0000ee" object="global" />
<visitedLinkColor rgb="#52188b" object="global" /> <visitedLinkColor rgb="#52188b" object="global" />
<activeForeground rgb="#ffffff" object="kwin" /> <activeForeground rgb="#ffffff" object="twin" />
<inactiveBackground rgb="#9daaba" object="kwin" /> <inactiveBackground rgb="#9daaba" object="twin" />
<inactiveBlend rgb="#9daaba" object="kwin" /> <inactiveBlend rgb="#9daaba" object="twin" />
<activeBackground rgb="#418edc" object="kwin" /> <activeBackground rgb="#418edc" object="twin" />
<activeBlend rgb="#6b91b8" object="kwin" /> <activeBlend rgb="#6b91b8" object="twin" />
<inactiveForeground rgb="#dddddd" object="kwin" /> <inactiveForeground rgb="#dddddd" object="twin" />
<activeTitleBtnBg rgb="#dcdcdc" object="kwin" /> <activeTitleBtnBg rgb="#dcdcdc" object="twin" />
<inactiveTitleBtnBg rgb="#dcdcdc" object="kwin" /> <inactiveTitleBtnBg rgb="#dcdcdc" object="twin" />
</colors> </colors>
<cursors name="" /> <cursors name="" />
<wm type="builtin" name="kwin3_plastik" > <wm type="builtin" name="twin3_plastik" >
<border size="1" /> <border size="1" />
</wm> </wm>
<konqueror> <konqueror>

@ -90,17 +90,17 @@
<buttonForeground rgb="#000000" object="global" /> <buttonForeground rgb="#000000" object="global" />
<linkColor rgb="#0000c0" object="global" /> <linkColor rgb="#0000c0" object="global" />
<visitedLinkColor rgb="#800080" object="global" /> <visitedLinkColor rgb="#800080" object="global" />
<activeForeground rgb="#020202" object="kwin" /> <activeForeground rgb="#020202" object="twin" />
<inactiveBackground rgb="#96a7ca" object="kwin" /> <inactiveBackground rgb="#96a7ca" object="twin" />
<inactiveBlend rgb="#9db0d0" object="kwin" /> <inactiveBlend rgb="#9db0d0" object="twin" />
<activeBackground rgb="#e9e9e9" object="kwin" /> <activeBackground rgb="#e9e9e9" object="twin" />
<activeBlend rgb="#e9e9e9" object="kwin" /> <activeBlend rgb="#e9e9e9" object="twin" />
<inactiveForeground rgb="#5d7091" object="kwin" /> <inactiveForeground rgb="#5d7091" object="twin" />
<activeTitleBtnBg rgb="#dcdcdc" object="kwin" /> <activeTitleBtnBg rgb="#dcdcdc" object="twin" />
<inactiveTitleBtnBg rgb="#dcdcdc" object="kwin" /> <inactiveTitleBtnBg rgb="#dcdcdc" object="twin" />
</colors> </colors>
<cursors name="" /> <cursors name="" />
<wm type="builtin" name="kwin3_system" > <wm type="builtin" name="twin3_system" >
<border size="1" /> <border size="1" />
</wm> </wm>
<konqueror> <konqueror>

@ -90,17 +90,17 @@
<buttonForeground rgb="#000000" object="global" /> <buttonForeground rgb="#000000" object="global" />
<linkColor rgb="#0000c0" object="global" /> <linkColor rgb="#0000c0" object="global" />
<visitedLinkColor rgb="#800080" object="global" /> <visitedLinkColor rgb="#800080" object="global" />
<activeForeground rgb="#ffffff" object="kwin" /> <activeForeground rgb="#ffffff" object="twin" />
<inactiveBackground rgb="#dcdcdc" object="kwin" /> <inactiveBackground rgb="#dcdcdc" object="twin" />
<inactiveBlend rgb="#dcdcdc" object="kwin" /> <inactiveBlend rgb="#dcdcdc" object="twin" />
<activeBackground rgb="#002468" object="kwin" /> <activeBackground rgb="#002468" object="twin" />
<activeBlend rgb="#a8ccf0" object="kwin" /> <activeBlend rgb="#a8ccf0" object="twin" />
<inactiveForeground rgb="#000000" object="kwin" /> <inactiveForeground rgb="#000000" object="twin" />
<activeTitleBtnBg rgb="#dcdcdc" object="kwin" /> <activeTitleBtnBg rgb="#dcdcdc" object="twin" />
<inactiveTitleBtnBg rgb="#dcdcdc" object="kwin" /> <inactiveTitleBtnBg rgb="#dcdcdc" object="twin" />
</colors> </colors>
<cursors name="" /> <cursors name="" />
<wm type="builtin" name="kwin3_redmond" > <wm type="builtin" name="twin3_redmond" >
<border size="1" /> <border size="1" />
</wm> </wm>
<konqueror> <konqueror>

@ -90,17 +90,17 @@
<buttonForeground rgb="#000000" object="global" /> <buttonForeground rgb="#000000" object="global" />
<linkColor rgb="#0000ff" object="global" /> <linkColor rgb="#0000ff" object="global" />
<visitedLinkColor rgb="#c0ffff" object="global" /> <visitedLinkColor rgb="#c0ffff" object="global" />
<activeForeground rgb="#ffffff" object="kwin" /> <activeForeground rgb="#ffffff" object="twin" />
<inactiveBackground rgb="#aeb2c3" object="kwin" /> <inactiveBackground rgb="#aeb2c3" object="twin" />
<inactiveBlend rgb="#aeb2c3" object="kwin" /> <inactiveBlend rgb="#aeb2c3" object="twin" />
<activeBackground rgb="#b24d7a" object="kwin" /> <activeBackground rgb="#b24d7a" object="twin" />
<activeBlend rgb="#aeb2c3" object="kwin" /> <activeBlend rgb="#aeb2c3" object="twin" />
<inactiveForeground rgb="#000000" object="kwin" /> <inactiveForeground rgb="#000000" object="twin" />
<activeTitleBtnBg rgb="#aeb2c3" object="kwin" /> <activeTitleBtnBg rgb="#aeb2c3" object="twin" />
<inactiveTitleBtnBg rgb="#aeb2c3" object="kwin" /> <inactiveTitleBtnBg rgb="#aeb2c3" object="twin" />
</colors> </colors>
<cursors name="" /> <cursors name="" />
<wm type="builtin" name="kwin3_cde" > <wm type="builtin" name="twin3_cde" >
<border size="1" /> <border size="1" />
</wm> </wm>
<konqueror> <konqueror>

@ -121,21 +121,21 @@
<linkColor rgb="#ffff00" object="global" /> <linkColor rgb="#ffff00" object="global" />
<visitedLinkColor rgb="#ffff00" object="global" /> <visitedLinkColor rgb="#ffff00" object="global" />
<alternateBackground rgb="#0000d7" object="global" /> <alternateBackground rgb="#0000d7" object="global" />
<activeForeground rgb="#ffff00" object="kwin" /> <activeForeground rgb="#ffff00" object="twin" />
<inactiveBackground rgb="#1e1ee1" object="kwin" /> <inactiveBackground rgb="#1e1ee1" object="twin" />
<inactiveBlend rgb="#1e1ee1" object="kwin" /> <inactiveBlend rgb="#1e1ee1" object="twin" />
<activeBackground rgb="#0000b4" object="kwin" /> <activeBackground rgb="#0000b4" object="twin" />
<activeBlend rgb="#0000b4" object="kwin" /> <activeBlend rgb="#0000b4" object="twin" />
<inactiveForeground rgb="#808080" object="kwin" /> <inactiveForeground rgb="#808080" object="twin" />
<activeTitleBtnBg rgb="#ffff00" object="kwin" /> <activeTitleBtnBg rgb="#ffff00" object="twin" />
<inactiveTitleBtnBg rgb="#aaaa55" object="kwin" /> <inactiveTitleBtnBg rgb="#aaaa55" object="twin" />
<frame rgb="#00007a" object="kwin" /> <frame rgb="#00007a" object="twin" />
<inactiveFrame rgb="#1e1ee1" object="kwin" /> <inactiveFrame rgb="#1e1ee1" object="twin" />
<handle rgb="#00007a" object="kwin" /> <handle rgb="#00007a" object="twin" />
<inactiveHandle rgb="#1e1ee1" object="kwin" /> <inactiveHandle rgb="#1e1ee1" object="twin" />
</colors> </colors>
<cursors name="" /> <cursors name="" />
<wm type="builtin" name="kwin3_quartz" > <wm type="builtin" name="twin3_quartz" >
<border size="1" /> <border size="1" />
</wm> </wm>
<konqueror> <konqueror>

@ -121,21 +121,21 @@
<linkColor rgb="#ffff00" object="global" /> <linkColor rgb="#ffff00" object="global" />
<visitedLinkColor rgb="#ffff00" object="global" /> <visitedLinkColor rgb="#ffff00" object="global" />
<alternateBackground rgb="#0000d7" object="global" /> <alternateBackground rgb="#0000d7" object="global" />
<activeForeground rgb="#ffff00" object="kwin" /> <activeForeground rgb="#ffff00" object="twin" />
<inactiveBackground rgb="#1e1ee1" object="kwin" /> <inactiveBackground rgb="#1e1ee1" object="twin" />
<inactiveBlend rgb="#1e1ee1" object="kwin" /> <inactiveBlend rgb="#1e1ee1" object="twin" />
<activeBackground rgb="#0000b4" object="kwin" /> <activeBackground rgb="#0000b4" object="twin" />
<activeBlend rgb="#0000b4" object="kwin" /> <activeBlend rgb="#0000b4" object="twin" />
<inactiveForeground rgb="#808080" object="kwin" /> <inactiveForeground rgb="#808080" object="twin" />
<activeTitleBtnBg rgb="#ffff00" object="kwin" /> <activeTitleBtnBg rgb="#ffff00" object="twin" />
<inactiveTitleBtnBg rgb="#aaaa55" object="kwin" /> <inactiveTitleBtnBg rgb="#aaaa55" object="twin" />
<frame rgb="#00007a" object="kwin" /> <frame rgb="#00007a" object="twin" />
<inactiveFrame rgb="#1e1ee1" object="kwin" /> <inactiveFrame rgb="#1e1ee1" object="twin" />
<handle rgb="#00007a" object="kwin" /> <handle rgb="#00007a" object="twin" />
<inactiveHandle rgb="#1e1ee1" object="kwin" /> <inactiveHandle rgb="#1e1ee1" object="twin" />
</colors> </colors>
<cursors name="" /> <cursors name="" />
<wm type="builtin" name="kwin3_quartz" > <wm type="builtin" name="twin3_quartz" >
<border size="1" /> <border size="1" />
</wm> </wm>
<konqueror> <konqueror>

@ -44,15 +44,15 @@ Sample XML theme config file:
</desktop> </desktop>
<icons name="crystalsvg" /> <icons name="crystalsvg" />
<sounds> <sounds>
<event object="global|kwin" name="eventname" url="theme:/sounds/file.wav" /> <event object="global|twin" name="eventname" url="theme:/sounds/file.wav" />
... ...
</sounds> </sounds>
<colors contrast="7"> <colors contrast="7">
<alternateBackground rgb="#123456" object="global|kwin"/> <alternateBackground rgb="#123456" object="global|twin"/>
... ...
</colors> </colors>
<cursors name="theme_name" /> <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" /> <buttons left="M" right="HIAX" />
<border size="number" /> <border size="number" />
</wm> </wm>

@ -1,5 +1,5 @@
- use KHotNewStuff for directly downloading themes from kde-look.org - 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 - write user and theme developer documentation
Handle: Handle:

@ -127,9 +127,9 @@ TQString KTheme::createYourself( bool pack )
// 2. Background theme // 2. Background theme
KConfig * globalConf = KGlobal::config(); KConfig * globalConf = KGlobal::config();
KConfig kwinConf( "kwinrc", true ); KConfig twinConf( "twinrc", true );
kwinConf.setGroup( "Desktops" ); twinConf.setGroup( "Desktops" );
uint numDesktops = kwinConf.readUnsignedNumEntry( "Number", 4 ); uint numDesktops = twinConf.readUnsignedNumEntry( "Number", 4 );
KConfig desktopConf( "kdesktoprc", true ); KConfig desktopConf( "kdesktoprc", true );
desktopConf.setGroup( "Background Common" ); desktopConf.setGroup( "Background Common" );
@ -205,9 +205,9 @@ TQString KTheme::createYourself( bool pack )
<< "messageboxQuestion"; << "messageboxQuestion";
// 4.2 KWin sounds // 4.2 KWin sounds
KConfig * kwinSoundConf = new KConfig( "kwin.eventsrc", true ); KConfig * twinSoundConf = new KConfig( "twin.eventsrc", true );
TQStringList kwinEvents; TQStringList twinEvents;
kwinEvents << "activate" << "close" << "delete" << twinEvents << "activate" << "close" << "delete" <<
"desktop1" << "desktop2" << "desktop3" << "desktop4" << "desktop1" << "desktop2" << "desktop3" << "desktop4" <<
"desktop5" << "desktop6" << "desktop7" << "desktop8" << "desktop5" << "desktop6" << "desktop7" << "desktop8" <<
"maximize" << "minimize" << "moveend" << "movestart" << "maximize" << "minimize" << "moveend" << "movestart" <<
@ -217,10 +217,10 @@ TQString KTheme::createYourself( bool pack )
TQDomElement soundsElem = m_dom.createElement( "sounds" ); TQDomElement soundsElem = m_dom.createElement( "sounds" );
createSoundList( stdEvents, "global", soundsElem, soundConf ); createSoundList( stdEvents, "global", soundsElem, soundConf );
createSoundList( kwinEvents, "kwin", soundsElem, kwinSoundConf ); createSoundList( twinEvents, "twin", soundsElem, twinSoundConf );
m_root.appendChild( soundsElem ); m_root.appendChild( soundsElem );
delete soundConf; delete soundConf;
delete kwinSoundConf; delete twinSoundConf;
// 5. Colors // 5. Colors
@ -236,13 +236,13 @@ TQString KTheme::createYourself( bool pack )
for ( TQStringList::Iterator it = stdColors.begin(); it != stdColors.end(); ++it ) for ( TQStringList::Iterator it = stdColors.begin(); it != stdColors.end(); ++it )
createColorElem( ( *it ), "global", colorsElem, globalConf ); createColorElem( ( *it ), "global", colorsElem, globalConf );
TQStringList kwinColors; TQStringList twinColors;
kwinColors << "activeForeground" << "inactiveBackground" << "inactiveBlend" << "activeBackground" twinColors << "activeForeground" << "inactiveBackground" << "inactiveBlend" << "activeBackground"
<< "activeBlend" << "inactiveForeground" << "activeTitleBtnBg" << "inactiveTitleBtnBg" << "activeBlend" << "inactiveForeground" << "activeTitleBtnBg" << "inactiveTitleBtnBg"
<< "frame" << "inactiveFrame" << "handle" << "inactiveHandle"; << "frame" << "inactiveFrame" << "handle" << "inactiveHandle";
globalConf->setGroup( "WM" ); globalConf->setGroup( "WM" );
for ( TQStringList::Iterator it = kwinColors.begin(); it != kwinColors.end(); ++it ) for ( TQStringList::Iterator it = twinColors.begin(); it != twinColors.end(); ++it )
createColorElem( ( *it ), "kwin", colorsElem, globalConf ); createColorElem( ( *it ), "twin", colorsElem, globalConf );
m_root.appendChild( colorsElem ); m_root.appendChild( colorsElem );
@ -256,19 +256,19 @@ TQString KTheme::createYourself( bool pack )
// TODO copy the cursor theme? // TODO copy the cursor theme?
// 7. KWin // 7. KWin
kwinConf.setGroup( "Style" ); twinConf.setGroup( "Style" );
TQDomElement wmElem = m_dom.createElement( "wm" ); TQDomElement wmElem = m_dom.createElement( "wm" );
wmElem.setAttribute( "name", kwinConf.readEntry( "PluginLib" ) ); wmElem.setAttribute( "name", twinConf.readEntry( "PluginLib" ) );
wmElem.setAttribute( "type", "builtin" ); // TODO support pixmap themes when the kwin client gets ported wmElem.setAttribute( "type", "builtin" ); // TODO support pixmap themes when the twin client gets ported
if ( kwinConf.readBoolEntry( "CustomButtonPositions" ) ) if ( twinConf.readBoolEntry( "CustomButtonPositions" ) )
{ {
TQDomElement buttonsElem = m_dom.createElement( "buttons" ); TQDomElement buttonsElem = m_dom.createElement( "buttons" );
buttonsElem.setAttribute( "left", kwinConf.readEntry( "ButtonsOnLeft" ) ); buttonsElem.setAttribute( "left", twinConf.readEntry( "ButtonsOnLeft" ) );
buttonsElem.setAttribute( "right", kwinConf.readEntry( "ButtonsOnRight" ) ); buttonsElem.setAttribute( "right", twinConf.readEntry( "ButtonsOnRight" ) );
wmElem.appendChild( buttonsElem ); wmElem.appendChild( buttonsElem );
} }
TQDomElement borderElem = m_dom.createElement( "border" ); TQDomElement borderElem = m_dom.createElement( "border" );
borderElem.setAttribute( "size", kwinConf.readNumEntry( "BorderSize", 1 ) ); borderElem.setAttribute( "size", twinConf.readNumEntry( "BorderSize", 1 ) );
wmElem.appendChild( borderElem ); wmElem.appendChild( borderElem );
m_root.appendChild( wmElem ); m_root.appendChild( wmElem );
@ -493,7 +493,7 @@ void KTheme::apply()
if ( !soundsElem.isNull() ) if ( !soundsElem.isNull() )
{ {
KConfig soundConf( "knotify.eventsrc" ); KConfig soundConf( "knotify.eventsrc" );
KConfig kwinSoundConf( "kwin.eventsrc" ); KConfig twinSoundConf( "twin.eventsrc" );
TQDomNodeList eventList = soundsElem.elementsByTagName( "event" ); TQDomNodeList eventList = soundsElem.elementsByTagName( "event" );
for ( uint i = 0; i < eventList.count(); i++ ) 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( "soundfile", unprocessFilePath( "sounds", eventElem.attribute( "url" ) ) );
soundConf.writeEntry( "presentation", soundConf.readNumEntry( "presentation" ) | 1 ); soundConf.writeEntry( "presentation", soundConf.readNumEntry( "presentation" ) | 1 );
} }
else if ( object == "kwin" ) else if ( object == "twin" )
{ {
kwinSoundConf.setGroup( eventElem.attribute( "name" ) ); twinSoundConf.setGroup( eventElem.attribute( "name" ) );
kwinSoundConf.writeEntry( "soundfile", unprocessFilePath( "sounds", eventElem.attribute( "url" ) ) ); twinSoundConf.writeEntry( "soundfile", unprocessFilePath( "sounds", eventElem.attribute( "url" ) ) );
kwinSoundConf.writeEntry( "presentation", soundConf.readNumEntry( "presentation" ) | 1 ); twinSoundConf.writeEntry( "presentation", soundConf.readNumEntry( "presentation" ) | 1 );
} }
} }
soundConf.sync(); soundConf.sync();
kwinSoundConf.sync(); twinSoundConf.sync();
client->send("knotify", "", "reconfigure()", TQString("")); client->send("knotify", "", "reconfigure()", TQString(""));
// TODO signal kwin sounds change? // TODO signal twin sounds change?
} }
// 5. Colors // 5. Colors
@ -538,7 +538,7 @@ void KTheme::apply()
TQString object = colorElem.attribute( "object" ); TQString object = colorElem.attribute( "object" );
if ( object == "global" ) if ( object == "global" )
colorConf->setGroup( "General" ); colorConf->setGroup( "General" );
else if ( object == "kwin" ) else if ( object == "twin" )
colorConf->setGroup( "WM" ); colorConf->setGroup( "WM" );
TQString colName = colorElem.tagName(); TQString colName = colorElem.tagName();
@ -573,27 +573,27 @@ void KTheme::apply()
if ( !wmElem.isNull() ) if ( !wmElem.isNull() )
{ {
KConfig kwinConf( "kwinrc" ); KConfig twinConf( "twinrc" );
kwinConf.setGroup( "Style" ); twinConf.setGroup( "Style" );
TQString type = wmElem.attribute( "type" ); TQString type = wmElem.attribute( "type" );
if ( type == "builtin" ) if ( type == "builtin" )
kwinConf.writeEntry( "PluginLib", wmElem.attribute( "name" ) ); twinConf.writeEntry( "PluginLib", wmElem.attribute( "name" ) );
//else // TODO support custom themes //else // TODO support custom themes
TQDomNodeList buttons = wmElem.elementsByTagName ("buttons"); TQDomNodeList buttons = wmElem.elementsByTagName ("buttons");
if ( buttons.count() > 0 ) if ( buttons.count() > 0 )
{ {
kwinConf.writeEntry( "CustomButtonPositions", true ); twinConf.writeEntry( "CustomButtonPositions", true );
kwinConf.writeEntry( "ButtonsOnLeft", getProperty( wmElem, "buttons", "left" ) ); twinConf.writeEntry( "ButtonsOnLeft", getProperty( wmElem, "buttons", "left" ) );
kwinConf.writeEntry( "ButtonsOnRight", getProperty( wmElem, "buttons", "right" ) ); twinConf.writeEntry( "ButtonsOnRight", getProperty( wmElem, "buttons", "right" ) );
} }
else 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(); twinConf.sync();
client->send( "kwin", "", "reconfigure()", TQString("") ); client->send( "twin", "", "reconfigure()", TQString("") );
} }
// 8. Konqueror // 8. Konqueror

@ -171,7 +171,7 @@ private:
/** /**
* Creates a list of "event" elements based on: * Creates a list of "event" elements based on:
* @param events The list of events to work 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 parent Parent element to append to
* @param cfg The KConfig object to work with * @param cfg The KConfig object to work with
*/ */

@ -29,7 +29,7 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <kregexpeditorinterface.h> #include <kregexpeditorinterface.h>
#include <kparts/componentfactory.h> #include <kparts/componentfactory.h>

@ -26,7 +26,7 @@
#include <qprogressbar.h> #include <qprogressbar.h>
#include <qlabel.h> #include <qlabel.h>
#include <kwin.h> #include <twin.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>

@ -1,6 +1,6 @@
#include <config.h> #include <config.h>
#include <kwin.h> #include <twin.h>
#include "testwin.h" #include "testwin.h"
#ifdef HAVE_GLXCHOOSEVISUAL #ifdef HAVE_GLXCHOOSEVISUAL

@ -1,4 +1,4 @@
#include <kwin.h> #include <twin.h>
#include "testwin.h" #include "testwin.h"
class QXEmbed; class QXEmbed;

@ -649,7 +649,7 @@ void KCMStyle::save()
if (m_bEffectsDirty) { if (m_bEffectsDirty) {
KIPC::sendMessageAll(KIPC::SettingsChanged); 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 //update kicker to re-used tooltips kicker parameter otherwise, it overwritted
//by style tooltips parameters. //by style tooltips parameters.

@ -29,7 +29,7 @@
#include <kconfig.h> #include <kconfig.h>
#include <kdialog.h> #include <kdialog.h>
#include <kgenericfactory.h> #include <kgenericfactory.h>
#include <kwin.h> #include <twin.h>
#include <kcolorbutton.h> #include <kcolorbutton.h>
#include <tqlabel.h> #include <tqlabel.h>

@ -29,7 +29,7 @@
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kwin.h> #include <twin.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqlayout.h> #include <tqlayout.h>
@ -177,7 +177,7 @@ void KCMXinerama::save() {
if (!kapp->dcopClient()->isAttached()) if (!kapp->dcopClient()->isAttached())
kapp->dcopClient()->attach(); kapp->dcopClient()->attach();
kapp->dcopClient()->send("kwin", "", "reconfigure()", TQString("")); kapp->dcopClient()->send("twin", "", "reconfigure()", TQString(""));
ksplashrc->setGroup("Xinerama"); ksplashrc->setGroup("Xinerama");
ksplashrc->writeEntry("KSplashScreen", xw->_enableXinerama->isChecked() ? xw->_ksplashDisplay->currentItem() : -2 /* ignore Xinerama */); ksplashrc->writeEntry("KSplashScreen", xw->_enableXinerama->isChecked() ? xw->_ksplashDisplay->currentItem() : -2 /* ignore Xinerama */);

@ -23,12 +23,12 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <kconfig.h> #include <kconfig.h>
#include <kwin.h> #include <twin.h>
#include <kapplication.h> #include <kapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <kipc.h> #include <kipc.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <krootpixmap.h> #include <krootpixmap.h>
#include <X11/X.h> #include <X11/X.h>
@ -59,7 +59,7 @@ extern KDesktopApp *myApp;
/**** KBackgroundManager ****/ /**** KBackgroundManager ****/
KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* kwinModule) KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* twinModule)
: KBackgroundIface() : KBackgroundIface()
{ {
if( !properties_inited ) if( !properties_inited )
@ -80,7 +80,7 @@ KBackgroundManager::KBackgroundManager(TQWidget *desktop, KWinModule* kwinModule
m_Serial = 0; m_Hash = 0; m_Serial = 0; m_Hash = 0;
m_pConfig = KGlobal::config(); m_pConfig = KGlobal::config();
m_bExport = m_bCommon = m_bInit = false; m_bExport = m_bCommon = m_bInit = false;
m_pKwinmodule = kwinModule; m_pKwinmodule = twinModule;
m_pPixmapServer = new KPixmapServer(); m_pPixmapServer = new KPixmapServer();
m_xrootpmap = None; m_xrootpmap = None;

@ -57,7 +57,7 @@ class KBackgroundManager
TQ_OBJECT TQ_OBJECT
public: public:
KBackgroundManager(TQWidget *desktop, KWinModule* kwinModule); KBackgroundManager(TQWidget *desktop, KWinModule* twinModule);
~KBackgroundManager(); ~KBackgroundManager();
void configure(); void configure();

@ -55,9 +55,9 @@
#include <ktempfile.h> #include <ktempfile.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kglobalaccel.h> #include <kglobalaccel.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <krun.h> #include <krun.h>
#include <kwin.h> #include <twin.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kapplication.h> #include <kapplication.h>
@ -67,7 +67,7 @@
//#include <kaccelbase.h> //#include <kaccelbase.h>
extern int kdesktop_screen_number; extern int kdesktop_screen_number;
extern TQCString kdesktop_name, kicker_name, kwin_name; extern TQCString kdesktop_name, kicker_name, twin_name;
KRootWidget::KRootWidget() : TQObject() KRootWidget::KRootWidget() : TQObject()
{ {
@ -168,7 +168,7 @@ KDesktop::KDesktop( bool x_root_hack, bool wait_for_kded ) :
if ( x_root_hack ) if ( x_root_hack )
{ {
// this is a ugly hack to make Dnd work // 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) :-) // actually my first try with ICCCM (Dirk) :-)
unsigned long data[2]; unsigned long data[2];
data[0] = (unsigned long) 1; data[0] = (unsigned long) 1;
@ -318,7 +318,7 @@ KDesktop::initRoot()
} }
else // we are not called from the ctor, so kicker should already run 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); m_pIconView->updateWorkArea(area);
} }
} }
@ -346,7 +346,7 @@ void KDesktop::slotNoKicker()
kdDebug(1204) << "KDesktop::slotNoKicker ... kicker did not respond" << endl; kdDebug(1204) << "KDesktop::slotNoKicker ... kicker did not respond" << endl;
// up till now, we got no desktopIconsArea from kicker - probably // up till now, we got no desktopIconsArea from kicker - probably
// it's not running, so use the area from KWinModule // 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 void
@ -516,7 +516,7 @@ void KDesktop::popupExecuteCommand(const TQString& command)
// Move minicli to the current desktop // Move minicli to the current desktop
NETWinInfo info( qt_xdisplay(), m_miniCli->winId(), qt_xrootwin(), NET::WMDesktop ); NETWinInfo info( qt_xdisplay(), m_miniCli->winId(), qt_xrootwin(), NET::WMDesktop );
int currentDesktop = kwinModule()->currentDesktop(); int currentDesktop = twinModule()->currentDesktop();
if ( info.desktop() != currentDesktop ) if ( info.desktop() != currentDesktop )
info.setDesktop( currentDesktop ); info.setDesktop( currentDesktop );
@ -614,10 +614,10 @@ void KDesktop::setShowDesktop( bool b )
if (b) if (b)
{ {
m_activeWindow = kwinModule()->activeWindow(); m_activeWindow = twinModule()->activeWindow();
m_iconifiedList.clear(); m_iconifiedList.clear();
const TQValueList<WId> windows = kwinModule()->windows(); const TQValueList<WId> windows = twinModule()->windows();
for (TQValueList<WId>::ConstIterator it = windows.begin(); for (TQValueList<WId>::ConstIterator it = windows.begin();
it != windows.end(); it != windows.end();
++it) ++it)
@ -629,7 +629,7 @@ void KDesktop::setShowDesktop( bool b )
if (info.mappingState() == NET::Visible && if (info.mappingState() == NET::Visible &&
(info.desktop() == NETWinInfo::OnAllDesktops || (info.desktop() == NETWinInfo::OnAllDesktops ||
info.desktop() == (int)kwinModule()->currentDesktop())) info.desktop() == (int)twinModule()->currentDesktop()))
{ {
m_iconifiedList.append( w ); 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 // 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))); 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))); TQT_SLOT(slotWindowChanged(WId,unsigned int)));
connect(kwinModule(), TQT_SIGNAL(windowAdded(WId)), connect(twinModule(), TQT_SIGNAL(windowAdded(WId)),
TQT_SLOT(slotWindowAdded(WId))); TQT_SLOT(slotWindowAdded(WId)));
} }
else else
{ {
disconnect(kwinModule(), TQT_SIGNAL(currentDesktopChanged(int)), disconnect(twinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
this, TQT_SLOT(slotCurrentDesktopChanged(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))); this, TQT_SLOT(slotWindowChanged(WId,unsigned int)));
disconnect(kwinModule(), TQT_SIGNAL(windowAdded(WId)), disconnect(twinModule(), TQT_SIGNAL(windowAdded(WId)),
this, TQT_SLOT(slotWindowAdded(WId))); this, TQT_SLOT(slotWindowAdded(WId)));
for (TQValueVector<WId>::ConstIterator it = m_iconifiedList.begin(); for (TQValueVector<WId>::ConstIterator it = m_iconifiedList.begin();
@ -696,9 +696,9 @@ void KDesktop::slotWindowAdded(WId w)
if ((windowType == NET::Normal || windowType == NET::Unknown) && if ((windowType == NET::Normal || windowType == NET::Unknown) &&
inf.mappingState() == NET::Visible) inf.mappingState() == NET::Visible)
{ {
KConfig kwincfg( "kwinrc", true ); // see in kwin KConfig twincfg( "twinrc", true ); // see in twin
kwincfg.setGroup( "Windows" ); twincfg.setGroup( "Windows" );
if( kwincfg.readBoolEntry( "ShowDesktopIsMinimizeAll", false )) if( twincfg.readBoolEntry( "ShowDesktopIsMinimizeAll", false ))
{ {
m_iconifiedList.clear(); m_iconifiedList.clear();
m_showingDesktop = false; m_showingDesktop = false;
@ -740,7 +740,7 @@ void KDesktop::slotWindowChanged(WId w, unsigned int dirty)
bool KDesktop::showDesktopState() bool KDesktop::showDesktopState()
{ {
return kwinModule()->showingDesktop(); return twinModule()->showingDesktop();
} }
void KDesktop::toggleShowDesktop() void KDesktop::toggleShowDesktop()
@ -836,7 +836,7 @@ void KDesktop::refresh()
m_bNeedRepaint |= 1; m_bNeedRepaint |= 1;
updateWorkArea(); updateWorkArea();
#endif #endif
kapp->dcopClient()->send( kwin_name, "", "refresh()", TQString("")); kapp->dcopClient()->send( twin_name, "", "refresh()", TQString(""));
refreshIcons(); refreshIcons();
} }
@ -1120,7 +1120,7 @@ void KDesktop::desktopResized()
res >> area; res >> area;
} }
else else
area = kwinModule()->workArea(kwinModule()->currentDesktop()); area = twinModule()->workArea(twinModule()->currentDesktop());
m_pIconView->updateWorkArea(area); m_pIconView->updateWorkArea(area);
m_pIconView->startDirLister(); m_pIconView->startDirLister();

@ -96,7 +96,7 @@ public:
void logout( KApplication::ShutdownConfirm confirm, KApplication::ShutdownType sdtype ); 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 // The action collection of the active widget
KActionCollection *actionCollection(); KActionCollection *actionCollection();
@ -153,7 +153,7 @@ private slots:
/** Connected to KDIconView and KRootWidget */ /** Connected to KDIconView and KRootWidget */
void slotSwitchDesktops(int delta); 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(); void slotNoKicker();
/** Used for desktop show/hide functionality */ /** Used for desktop show/hide functionality */

@ -144,7 +144,7 @@ Comment[uz@cyrillic]=Мавзуга боғни (URL) киритинг:
Comment[ven]=Dzhenisani vhukwamani kha fhethu (URL): Comment[ven]=Dzhenisani vhukwamani kha fhethu (URL):
Comment[vi]=Nhập liên kết tới trang mạng: Comment[vi]=Nhập liên kết tới trang mạng:
Comment[wa]=Novea loyén viè ene plaece (URL): 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_CN]=输入到位置(URL)的链接:
Comment[zh_TW]=輸入到位置的連結(URL) Comment[zh_TW]=輸入到位置的連結(URL)
Comment[zu]=Ngenisa isixhumanisi esiya endaweni (URL): Comment[zu]=Ngenisa isixhumanisi esiya endaweni (URL):

@ -43,8 +43,8 @@
#include <kstdaction.h> #include <kstdaction.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kurldrag.h> #include <kurldrag.h>
#include <kwin.h> #include <twin.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <fixx11h.h> #include <fixx11h.h>

@ -46,8 +46,8 @@
#include <dcopref.h> #include <dcopref.h>
#include <khelpmenu.h> #include <khelpmenu.h>
#include <kdebug.h> #include <kdebug.h>
#include <kwindowlistmenu.h> #include <twindowlistmenu.h>
#include <kwin.h> #include <twin.h>
#include <kmenubar.h> #include <kmenubar.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kuser.h> #include <kuser.h>
@ -67,7 +67,7 @@
KRootWm * KRootWm::s_rootWm = 0; 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) KRootWm::KRootWm(KDesktop* _desktop) : TQObject(_desktop), startup(FALSE)
{ {
@ -804,18 +804,18 @@ void KRootWm::slotToggleDesktopMenu()
// for the standalone menubar setting // for the standalone menubar setting
kapp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data ); kapp->dcopClient()->send( "menuapplet*", "menuapplet", "configure()", data );
kapp->dcopClient()->send( kicker_name, kicker_name, "configureMenubar()", 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() void KRootWm::slotUnclutterWindows()
{ {
kapp->dcopClient()->send(kwin_name, "KWinInterface", "unclutterDesktop()", TQString("")); kapp->dcopClient()->send(twin_name, "KWinInterface", "unclutterDesktop()", TQString(""));
} }
void KRootWm::slotCascadeWindows() { void KRootWm::slotCascadeWindows() {
kapp->dcopClient()->send(kwin_name, "KWinInterface", "cascadeDesktop()", TQString("")); kapp->dcopClient()->send(twin_name, "KWinInterface", "cascadeDesktop()", TQString(""));
} }

@ -42,8 +42,8 @@
#include <kstdguiitem.h> #include <kstdguiitem.h>
#include <kpixmapeffect.h> #include <kpixmapeffect.h>
#include <kpixmap.h> #include <kpixmap.h>
#include <kwin.h> #include <twin.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <kdialog.h> #include <kdialog.h>
#include <tqframe.h> #include <tqframe.h>

@ -76,7 +76,7 @@ KDesktopApp *myApp = NULL;
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
int kdesktop_screen_number = 0; int kdesktop_screen_number = 0;
TQCString kdesktop_name, kicker_name, kwin_name; TQCString kdesktop_name, kicker_name, twin_name;
static void crashHandler(int sigId) static void crashHandler(int sigId)
{ {
@ -161,11 +161,11 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
if (kdesktop_screen_number == 0) { if (kdesktop_screen_number == 0) {
kdesktop_name = "kdesktop"; kdesktop_name = "kdesktop";
kicker_name = "kicker"; kicker_name = "kicker";
kwin_name = "kwin"; twin_name = "twin";
} else { } else {
kdesktop_name.sprintf("kdesktop-screen-%d", kdesktop_screen_number); kdesktop_name.sprintf("kdesktop-screen-%d", kdesktop_screen_number);
kicker_name.sprintf("kicker-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"), KAboutData aboutData( kdesktop_name, I18N_NOOP("KDesktop"),

@ -57,7 +57,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kpassdlg.h> #include <kpassdlg.h>
#include <krun.h> #include <krun.h>
#include <kwin.h> #include <twin.h>
#include <tdesu/su.h> #include <tdesu/su.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kconfig.h> #include <kconfig.h>

@ -1998,13 +1998,13 @@ Description:
Key: WindowManager Key: WindowManager
Type: string Type: string
Default: "kwin" Default: "twin"
User: greeter User: greeter
Instance: #*/"" Instance: #*/""
Comment: Comment:
Window manager binary name, if window decorations are desired. "" means no window manager support. Window manager binary name, if window decorations are desired. "" means no window manager support.
Description: Description:
Specify the Xorg window manager. Currently only kwin is supported. Specify the Xorg window manager. Currently only twin is supported.
Key: UseSAK Key: UseSAK
Type: bool Type: bool

@ -57,7 +57,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <stdlib.h> #include <stdlib.h>
extern bool has_kwin; extern bool has_twin;
int KDMShutdownBase::curPlugin = -1; int KDMShutdownBase::curPlugin = -1;
PluginList KDMShutdownBase::pluginList; PluginList KDMShutdownBase::pluginList;
@ -480,7 +480,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
if(doUbuntuLogout) if(doUbuntuLogout)
{ {
TQVBoxLayout* vbox = new TQVBoxLayout( this ); TQVBoxLayout* vbox = new TQVBoxLayout( this );
if (has_kwin) if (has_twin)
lfrm->setFrameStyle( TQFrame::NoFrame ); lfrm->setFrameStyle( TQFrame::NoFrame );
else else
lfrm->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised ); lfrm->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised );
@ -548,7 +548,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
else else
{ {
TQHBoxLayout *hbox = new TQHBoxLayout( this, KDmh, KDsh ); TQHBoxLayout *hbox = new TQHBoxLayout( this, KDmh, KDsh );
if (has_kwin) if (has_twin)
lfrm->setFrameStyle( TQFrame::NoFrame ); lfrm->setFrameStyle( TQFrame::NoFrame );
else else
lfrm->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); lfrm->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );

@ -38,11 +38,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
extern bool has_kwin; extern bool has_twin;
extern bool is_themed; extern bool is_themed;
FDialog::FDialog( TQWidget *parent, bool framed ) 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) { if (framed) {
// Signal that we do not want any window controls to be shown at all // Signal that we do not want any window controls to be shown at all

@ -66,7 +66,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <pwd.h> #include <pwd.h>
bool argb_visual_available = false; bool argb_visual_available = false;
bool has_kwin = false; bool has_twin = false;
bool is_themed = false; bool is_themed = false;
bool trinity_desktop_lock_use_sak = TRUE; bool trinity_desktop_lock_use_sak = TRUE;
@ -190,7 +190,7 @@ kg_main( const char *argv0 )
KProcess *tsak = 0; KProcess *tsak = 0;
KProcess *proc = 0; KProcess *proc = 0;
KProcess *comp = 0; KProcess *comp = 0;
KProcess *kwin = 0; KProcess *twin = 0;
trinity_desktop_lock_use_sak = _useSAK; trinity_desktop_lock_use_sak = _useSAK;
if (trinity_desktop_lock_use_sak) { if (trinity_desktop_lock_use_sak) {
@ -310,10 +310,10 @@ kg_main( const char *argv0 )
} }
if (!_windowManager.isEmpty()) { if (!_windowManager.isEmpty()) {
kwin = new KProcess; twin = new KProcess;
*kwin << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + _windowManager.ascii(); *twin << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + _windowManager.ascii();
kwin->start(); twin->start();
has_kwin = true; has_twin = true;
} }
GSendInt( G_Ready ); 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 // This also prevents the user from being dropped to a console login if Xorg glitches or is buggy
XSetErrorHandler( ignoreXError ); XSetErrorHandler( ignoreXError );
KThemedGreeter *tgrt; KThemedGreeter *tgrt;
bool has_kwin_bkp = has_kwin; bool has_twin_bkp = has_twin;
is_themed = true; 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; dialog = tgrt = new KThemedGreeter;
kdDebug() << timestamp() << " themed" << endl; kdDebug() << timestamp() << " themed" << endl;
if (!tgrt->isOK()) { if (!tgrt->isOK()) {
is_themed = false; is_themed = false;
has_kwin = has_kwin_bkp; has_twin = has_twin_bkp;
delete tgrt; delete tgrt;
checkSAK(app); checkSAK(app);
dialog = new KStdGreeter; dialog = new KStdGreeter;
@ -450,10 +450,10 @@ kg_main( const char *argv0 )
comp->detach(); comp->detach();
delete comp; delete comp;
} }
if (kwin) { if (twin) {
kwin->closeStdin(); twin->closeStdin();
kwin->detach(); twin->detach();
delete kwin; delete twin;
} }
delete proc; delete proc;
UnsecureDisplay( dpy ); UnsecureDisplay( dpy );

@ -19,7 +19,7 @@
#include <kglobalaccel.h> #include <kglobalaccel.h>
#include <kconfig.h> #include <kconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <klocale.h> #include <klocale.h>
#include <netwm_def.h> #include <netwm_def.h>
#include <kaccel.h> #include <kaccel.h>

@ -21,8 +21,8 @@
#include <kconfig.h> #include <kconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <kwin.h> #include <twin.h>
#include <klocale.h> #include <klocale.h>
#include "khotkeysglobal.h" #include "khotkeysglobal.h"
@ -39,15 +39,15 @@ namespace KHotKeys
Windows::Windows( bool enable_signal_P, TQObject* parent_P ) Windows::Windows( bool enable_signal_P, TQObject* parent_P )
: TQObject( parent_P ), signals_enabled( enable_signal_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 ); assert( windows_handler == NULL );
windows_handler = this; windows_handler = this;
if( signals_enabled ) if( signals_enabled )
{ {
connect( kwin_module, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( window_added_slot( WId ))); connect( twin_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( twin_module, TQT_SIGNAL( windowRemoved( WId )), TQT_SLOT( window_removed_slot( WId )));
connect( kwin_module, TQT_SIGNAL( activeWindowChanged( WId )), connect( twin_module, TQT_SIGNAL( activeWindowChanged( WId )),
TQT_SLOT( active_window_changed_slot( WId ))); TQT_SLOT( active_window_changed_slot( WId )));
} }
} }
@ -112,7 +112,7 @@ TQString Windows::get_window_class( WId id_P )
WId Windows::active_window() WId Windows::active_window()
{ {
return kwin_module->activeWindow(); return twin_module->activeWindow();
} }
WId Windows::action_window() 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 ) WId Windows::find_window( const Windowdef_list* window_P )
{ {
for( TQValueList< WId >::ConstIterator it = kwin_module->windows().begin(); for( TQValueList< WId >::ConstIterator it = twin_module->windows().begin();
it != kwin_module->windows().end(); it != twin_module->windows().end();
++it ) ++it )
{ {
Window_data tmp( *it ); Window_data tmp( *it );
@ -185,13 +185,13 @@ void Windows::activate_window( WId id_P )
Window_data::Window_data( WId id_P ) Window_data::Window_data( WId id_P )
: type( NET::Unknown ) : type( NET::Unknown )
{ {
KWin::WindowInfo kwin_info = KWin::windowInfo( id_P, NET::WMName | NET::WMWindowType ); // TODO optimize KWin::WindowInfo twin_info = KWin::windowInfo( id_P, NET::WMName | NET::WMWindowType ); // TODO optimize
if( kwin_info.valid()) if( twin_info.valid())
{ {
title = kwin_info.name(); title = twin_info.name();
role = windows_handler->get_window_role( id_P ); role = windows_handler->get_window_role( id_P );
wclass = windows_handler->get_window_class( 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 if( type == NET::Override ) // HACK consider non-NETWM fullscreens to be normal too
type = NET::Normal; type = NET::Normal;
if( type == NET::Unknown ) if( type == NET::Unknown )

@ -63,7 +63,7 @@ class KDE_EXPORT Windows
void window_changed_slot( WId window_P, unsigned int flags_P ); void window_changed_slot( WId window_P, unsigned int flags_P );
private: private:
bool signals_enabled; bool signals_enabled;
KWinModule* kwin_module; KWinModule* twin_module;
WId _action_window; WId _action_window;
}; };

@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kdatepicker.h> #include <kdatepicker.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <kwin.h> #include <twin.h>
#include <netwm.h> #include <netwm.h>
DatePicker::DatePicker(TQWidget *parent, const TQDate& date, Prefs* _prefs) DatePicker::DatePicker(TQWidget *parent, const TQDate& date, Prefs* _prefs)

@ -35,8 +35,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
#include <kwin.h> #include <twin.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <netwm.h> #include <netwm.h>

@ -30,8 +30,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <dcopref.h> #include <dcopref.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kwin.h> #include <twin.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <kapplication.h> #include <kapplication.h>
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>
@ -114,11 +114,11 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
setFont( KGlobalSettings::taskbarFont() ); setFont( KGlobalSettings::taskbarFont() );
m_kwin = new KWinModule(TQT_TQOBJECT(this)); m_twin = new KWinModule(TQT_TQOBJECT(this));
m_activeWindow = m_kwin->activeWindow(); m_activeWindow = m_twin->activeWindow();
m_curDesk = m_kwin->currentDesktop(); m_curDesk = m_twin->currentDesktop();
if (m_curDesk == 0) // kwin not yet launched if (m_curDesk == 0) // twin not yet launched
{ {
m_curDesk = 1; m_curDesk = 1;
} }
@ -127,20 +127,20 @@ KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
desktopLayoutX = -1; desktopLayoutX = -1;
desktopLayoutY = -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; m_useViewports = s.width() * s.height() > 1;
drawButtons(); drawButtons();
connect( m_kwin, TQT_SIGNAL( currentDesktopChanged(int)), TQT_SLOT( slotSetDesktop(int) ) ); connect( m_twin, 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_twin, 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_twin, TQT_SIGNAL( numberOfDesktopsChanged(int)), TQT_SLOT( slotSetDesktopCount(int) ) );
connect( m_kwin, TQT_SIGNAL( desktopGeometryChanged(int)), TQT_SLOT( slotRefreshViewportCount(int) ) ); connect( m_twin, TQT_SIGNAL( desktopGeometryChanged(int)), TQT_SLOT( slotRefreshViewportCount(int) ) );
connect( m_kwin, TQT_SIGNAL( activeWindowChanged(WId)), TQT_SLOT( slotActiveWindowChanged(WId) ) ); connect( m_twin, TQT_SIGNAL( activeWindowChanged(WId)), TQT_SLOT( slotActiveWindowChanged(WId) ) );
connect( m_kwin, TQT_SIGNAL( windowAdded(WId) ), this, TQT_SLOT( slotWindowAdded(WId) ) ); connect( m_twin, TQT_SIGNAL( windowAdded(WId) ), this, TQT_SLOT( slotWindowAdded(WId) ) );
connect( m_kwin, TQT_SIGNAL( windowRemoved(WId) ), this, TQT_SLOT( slotWindowRemoved(WId) ) ); connect( m_twin, 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_twin, 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( desktopNamesChanged() ), this, TQT_SLOT( slotDesktopNamesChanged() ) );
connect( kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)) ); connect( kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)) );
if (kapp->authorizeKAction("kicker_rmb") && kapp->authorizeControlModule("kde-kcmtaskbar.desktop")) 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 it;
TQValueList<WId>::ConstIterator itEnd = m_kwin->windows().end(); TQValueList<WId>::ConstIterator itEnd = m_twin->windows().end();
for ( it = m_kwin->windows().begin(); it != itEnd; ++it) for ( it = m_twin->windows().begin(); it != itEnd; ++it)
{ {
slotWindowAdded( (*it) ); slotWindowAdded( (*it) );
} }
@ -172,7 +172,7 @@ KMiniPager::~KMiniPager()
void KMiniPager::slotBackgroundChanged(int desk) void KMiniPager::slotBackgroundChanged(int desk)
{ {
unsigned numDesktops = m_kwin->numberOfDesktops(); unsigned numDesktops = m_twin->numberOfDesktops();
if (numDesktops != m_desktops.count()) if (numDesktops != m_desktops.count())
{ {
slotSetDesktopCount(numDesktops); slotSetDesktopCount(numDesktops);
@ -189,9 +189,9 @@ void KMiniPager::slotBackgroundChanged(int desk)
void KMiniPager::slotSetDesktop(int desktop) 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())) 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 // holds down the key combo to switch desktops, lets the
// mouse go but keeps the key combo held. the desktop will switch // mouse go but keeps the key combo held. the desktop will switch
// back to the desktop associated with the key combo and then it // back to the desktop associated with the key combo and then it
// becomes a race condition between kwin's signal and the button's // becomes a race condition between twin's signal and the button's
// signal. usually kwin wins. // signal. usually twin wins.
return; return;
} }
@ -222,21 +222,21 @@ void KMiniPager::slotSetDesktopViewport(int desktop, const TQPoint& viewport)
{ {
// ### // ###
Q_UNUSED(desktop); 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() ); slotSetDesktop((viewport.y()-1) * s.width() + viewport.x() );
} }
void KMiniPager::slotButtonSelected( int desk ) void KMiniPager::slotButtonSelected( int desk )
{ {
if (m_kwin->numberOfViewports(m_kwin->currentDesktop()).width() * if (m_twin->numberOfViewports(m_twin->currentDesktop()).width() *
m_kwin->numberOfViewports(m_kwin->currentDesktop()).height() > 1) m_twin->numberOfViewports(m_twin->currentDesktop()).height() > 1)
{ {
TQPoint p; TQPoint p;
p.setX( (desk-1) * TQApplication::desktop()->width()); p.setX( (desk-1) * TQApplication::desktop()->width());
p.setY( 0 ); p.setY( 0 );
KWin::setCurrentDesktopViewport(m_kwin->currentDesktop(), p); KWin::setCurrentDesktopViewport(m_twin->currentDesktop(), p);
} }
else else
KWin::setCurrentDesktop( desk ); KWin::setCurrentDesktop( desk );
@ -251,8 +251,8 @@ int KMiniPager::widthForHeight(int h) const
return width(); return width();
} }
int deskNum = m_kwin->numberOfDesktops() * m_kwin->numberOfViewports(0).width() int deskNum = m_twin->numberOfDesktops() * m_twin->numberOfViewports(0).width()
* m_kwin->numberOfViewports(0).height(); * m_twin->numberOfViewports(0).height();
int rowNum = m_settings->numberOfRows(); int rowNum = m_settings->numberOfRows();
if (rowNum == 0) if (rowNum == 0)
@ -286,7 +286,7 @@ int KMiniPager::widthForHeight(int h) const
TQFontMetrics fm = fontMetrics(); TQFontMetrics fm = fontMetrics();
for (int i = 1; i <= deskNum; i++) 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) if (sw > bw)
{ {
bw = sw; bw = sw;
@ -307,8 +307,8 @@ int KMiniPager::heightForWidth(int w) const
return height(); return height();
} }
int deskNum = m_kwin->numberOfDesktops() * m_kwin->numberOfViewports(0).width() int deskNum = m_twin->numberOfDesktops() * m_twin->numberOfViewports(0).width()
* m_kwin->numberOfViewports(0).height(); * m_twin->numberOfViewports(0).height();
int rowNum = m_settings->numberOfRows(); // actually these are columns now... oh well. int rowNum = m_settings->numberOfRows(); // actually these are columns now... oh well.
if (rowNum == 0) if (rowNum == 0)
{ {
@ -442,8 +442,8 @@ void KMiniPager::wheelEvent( TQWheelEvent* e )
{ {
int newDesk; int newDesk;
int desktops = KWin::numberOfDesktops(); int desktops = KWin::numberOfDesktops();
if (m_kwin->numberOfViewports(0).width() * m_kwin->numberOfViewports(0).height() > 1 ) if (m_twin->numberOfViewports(0).width() * m_twin->numberOfViewports(0).height() > 1 )
desktops = m_kwin->numberOfViewports(0).width() * m_kwin->numberOfViewports(0).height(); desktops = m_twin->numberOfViewports(0).width() * m_twin->numberOfViewports(0).height();
if (e->delta() < 0) if (e->delta() < 0)
{ {
newDesk = m_curDesk % desktops + 1; newDesk = m_curDesk % desktops + 1;
@ -458,17 +458,17 @@ void KMiniPager::wheelEvent( TQWheelEvent* e )
void KMiniPager::drawButtons() void KMiniPager::drawButtons()
{ {
int deskNum = m_kwin->numberOfDesktops(); int deskNum = m_twin->numberOfDesktops();
KMiniPagerButton *desk; KMiniPagerButton *desk;
int count = 1; int count = 1;
int i = 1; int i = 1;
do do
{ {
TQSize viewportNum = m_kwin->numberOfViewports(i); TQSize viewportNum = m_twin->numberOfViewports(i);
for (int j = 1; j <= viewportNum.width() * viewportNum.height(); ++j) 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()); TQPoint viewport( (j-1) % s.width(), (j-1) / s.width());
desk = new KMiniPagerButton( count, m_useViewports, viewport, this ); desk = new KMiniPagerButton( count, m_useViewports, viewport, this );
if ( m_settings->labelType() != PagerSettings::EnumLabelType::LabelName ) if ( m_settings->labelType() != PagerSettings::EnumLabelType::LabelName )
@ -493,7 +493,7 @@ void KMiniPager::drawButtons()
void KMiniPager::slotSetDesktopCount( int ) 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; m_useViewports = s.width() * s.height() > 1;
TQValueList<KMiniPagerButton*>::ConstIterator it; TQValueList<KMiniPagerButton*>::ConstIterator it;
@ -506,7 +506,7 @@ void KMiniPager::slotSetDesktopCount( int )
drawButtons(); drawButtons();
m_curDesk = m_kwin->currentDesktop(); m_curDesk = m_twin->currentDesktop();
if ( m_curDesk == 0 ) if ( m_curDesk == 0 )
{ {
m_curDesk = 1; m_curDesk = 1;
@ -518,7 +518,7 @@ void KMiniPager::slotSetDesktopCount( int )
void KMiniPager::slotRefreshViewportCount( 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; m_useViewports = s.width() * s.height() > 1;
TQValueList<KMiniPagerButton*>::ConstIterator it; TQValueList<KMiniPagerButton*>::ConstIterator it;
@ -531,7 +531,7 @@ void KMiniPager::slotRefreshViewportCount( int )
drawButtons(); drawButtons();
m_curDesk = m_kwin->currentDesktop(); m_curDesk = m_twin->currentDesktop();
if ( m_curDesk == 0 ) if ( m_curDesk == 0 )
{ {
m_curDesk = 1; m_curDesk = 1;
@ -709,7 +709,7 @@ void KMiniPager::aboutToShowContextMenu()
m_contextMenu->insertSeparator(); m_contextMenu->insertSeparator();
m_contextMenu->insertItem(i18n("&Rename Desktop \"%1\"") m_contextMenu->insertItem(i18n("&Rename Desktop \"%1\"")
.arg(kwin()->desktopName(m_rmbDesk)), RenameDesktop); .arg(twin()->desktopName(m_rmbDesk)), RenameDesktop);
m_contextMenu->insertSeparator(); m_contextMenu->insertSeparator();
KPopupMenu* showMenu = new KPopupMenu(m_contextMenu); KPopupMenu* showMenu = new KPopupMenu(m_contextMenu);
@ -863,7 +863,7 @@ void KMiniPager::slotDesktopNamesChanged()
for (int i = 1; it != itEnd; ++it, ++i) for (int i = 1; it != itEnd; ++it, ++i)
{ {
TQString name = m_kwin->desktopName(i); TQString name = m_twin->desktopName(i);
(*it)->setDesktopName(name); (*it)->setDesktopName(name);
(*it)->tqrepaint(); (*it)->tqrepaint();
TQToolTip::remove((*it)); TQToolTip::remove((*it));

@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqintdict.h> #include <tqintdict.h>
#include <kpanelapplet.h> #include <kpanelapplet.h>
#include <kwin.h> #include <twin.h>
#include "pagerbutton.h" #include "pagerbutton.h"
#include "pagersettings.h" #include "pagersettings.h"
@ -58,7 +58,7 @@ public:
int heightForWidth(int width) const; int heightForWidth(int width) const;
KWin::WindowInfo* info( WId win ); KWin::WindowInfo* info( WId win );
KWinModule* kwin() { return m_kwin; } KWinModule* twin() { return m_twin; }
KTextShadowEngine* shadowEngine(); KTextShadowEngine* shadowEngine();
void setActive( WId active ) { m_activeWindow = active; } void setActive( WId active ) { m_activeWindow = active; }
@ -128,7 +128,7 @@ private:
int desktopLayoutY; int desktopLayoutY;
KSelectionOwner* m_desktopLayoutOwner; KSelectionOwner* m_desktopLayoutOwner;
KWinModule *m_kwin; KWinModule *m_twin;
KTextShadowEngine* m_shadowEngine; KTextShadowEngine* m_shadowEngine;
TQPopupMenu *m_contextMenu; TQPopupMenu *m_contextMenu;

@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <netwm.h> #include <netwm.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <ksharedpixmap.h> #include <ksharedpixmap.h>
#include <kpixmapio.h> #include <kpixmapio.h>
#include <kpixmapeffect.h> #include <kpixmapeffect.h>
@ -81,7 +81,7 @@ KMiniPagerButton::KMiniPagerButton(int desk, bool useViewPorts, const TQPoint& v
setBackgroundOrigin(AncestorOrigin); setBackgroundOrigin(AncestorOrigin);
installEventFilter(KickerTip::the()); 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(clicked()), TQT_SLOT(slotClicked()));
connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool))); 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 // ### fix vertically layouted viewports
TQRect _r(info.frameGeometry()); 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(), _r.moveBy( - (m_desktop - vx.x()) * TQApplication::desktop()->width(),
0); 0);
@ -127,7 +127,7 @@ TQPoint KMiniPagerButton::mapPointToViewport(const TQPoint& _p) const
{ {
if (!m_useViewports) return _p; 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 // ### fix vertically layouted viewports
TQPoint p(_p); TQPoint p(_p);
@ -443,12 +443,12 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
// window preview... // window preview...
if (m_pager->desktopPreview()) if (m_pager->desktopPreview())
{ {
KWinModule* kwin = m_pager->kwin(); KWinModule* twin = m_pager->twin();
KWin::WindowInfo *info = 0; KWin::WindowInfo *info = 0;
int dw = TQApplication::desktop()->width(); int dw = TQApplication::desktop()->width();
int dh = TQApplication::desktop()->height(); int dh = TQApplication::desktop()->height();
TQValueList<WId> windows = kwin->stackingOrder(); TQValueList<WId> windows = twin->stackingOrder();
TQValueList<WId>::const_iterator itEnd = windows.constEnd(); TQValueList<WId>::const_iterator itEnd = windows.constEnd();
for (TQValueList<WId>::ConstIterator it = windows.constBegin(); it != itEnd; ++it) 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 = TQRect(r.x() * width() / dw, 2 + r.y() * height() / dh,
r.width() * width() / dw, r.height() * 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); TQBrush brush = tqcolorGroup().brush(TQColorGroup::Highlight);
qDrawShadeRect(bp, r, tqcolorGroup(), false, 1, 0, &brush); qDrawShadeRect(bp, r, tqcolorGroup(), false, 1, 0, &brush);
@ -704,7 +704,7 @@ void KMiniPagerButton::dragLeaveEvent( TQDragLeaveEvent* e )
{ {
m_dragSwitchTimer.stop(); m_dragSwitchTimer.stop();
if (m_pager->kwin()->currentDesktop() != m_desktop) if (m_pager->twin()->currentDesktop() != m_desktop)
{ {
setDown(false); setDown(false);
} }
@ -750,7 +750,7 @@ bool KMiniPagerButton::eventFilter( TQObject *o, TQEvent * e)
if (o && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_lineEdit) && if (o && TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_lineEdit) &&
(e->type() == TQEvent::FocusOut || e->type() == TQEvent::Hide)) (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(); m_desktopName = m_lineEdit->text();
TQTimer::singleShot( 0, m_lineEdit, TQT_SLOT( deleteLater() ) ); TQTimer::singleShot( 0, m_lineEdit, TQT_SLOT( deleteLater() ) );
m_lineEdit = 0; m_lineEdit = 0;

@ -31,8 +31,8 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kprocess.h> #include <kprocess.h>
#include <kshell.h> #include <kshell.h>
#include <kwin.h> #include <twin.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>

@ -42,11 +42,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h> #include <kglobal.h>
#include <krun.h> #include <krun.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <kdialogbase.h> #include <kdialogbase.h>
#include <kactionselector.h> #include <kactionselector.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kwin.h> #include <twin.h>
#include "kickerSettings.h" #include "kickerSettings.h"
@ -102,7 +102,7 @@ SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int ac
setBackgroundOrigin(AncestorOrigin); 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 // kApplication notifies us of settings changes. added to support
// disabling of frame effect on mouse hover // disabling of frame effect on mouse hover
@ -121,7 +121,7 @@ void SystemTrayApplet::updateClockGeometry()
void SystemTrayApplet::initialize() void SystemTrayApplet::initialize()
{ {
// register existing tray windows // register existing tray windows
const TQValueList<WId> systemTrayWindows = kwin_module->systemTrayWindows(); const TQValueList<WId> systemTrayWindows = twin_module->systemTrayWindows();
bool existing = false; bool existing = false;
for (TQValueList<WId>::ConstIterator it = systemTrayWindows.begin(); for (TQValueList<WId>::ConstIterator it = systemTrayWindows.begin();
it != systemTrayWindows.end(); ++it ) it != systemTrayWindows.end(); ++it )
@ -139,9 +139,9 @@ void SystemTrayApplet::initialize()
} }
// the KWinModule notifies us when tray windows are added or removed // 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) ) ); this, TQT_SLOT( systemTrayWindowAdded(WId) ) );
connect( kwin_module, TQT_SIGNAL( systemTrayWindowRemoved(WId) ), connect( twin_module, TQT_SIGNAL( systemTrayWindowRemoved(WId) ),
this, TQT_SLOT( updateTrayWindows() ) ); this, TQT_SLOT( updateTrayWindows() ) );
TQCString screenstr; TQCString screenstr;
@ -711,7 +711,7 @@ void SystemTrayApplet::updateTrayWindows()
WId wid = (*emb)->embeddedWinId(); WId wid = (*emb)->embeddedWinId();
if ((wid == 0) || if ((wid == 0) ||
((*emb)->kdeTray() && ((*emb)->kdeTray() &&
!kwin_module->systemTrayWindows().contains(wid))) !twin_module->systemTrayWindows().contains(wid)))
{ {
(*emb)->deleteLater(); (*emb)->deleteLater();
emb = m_shownWins.erase(emb); emb = m_shownWins.erase(emb);
@ -728,7 +728,7 @@ void SystemTrayApplet::updateTrayWindows()
WId wid = (*emb)->embeddedWinId(); WId wid = (*emb)->embeddedWinId();
if ((wid == 0) || if ((wid == 0) ||
((*emb)->kdeTray() && ((*emb)->kdeTray() &&
!kwin_module->systemTrayWindows().contains(wid))) !twin_module->systemTrayWindows().contains(wid)))
{ {
(*emb)->deleteLater(); (*emb)->deleteLater();
emb = m_hiddenWins.erase(emb); emb = m_hiddenWins.erase(emb);

@ -104,7 +104,7 @@ private:
TrayEmbedList m_hiddenWins; TrayEmbedList m_hiddenWins;
TQStringList m_hiddenIconList; TQStringList m_hiddenIconList;
TQStringList m_sortOrderIconList; TQStringList m_sortOrderIconList;
KWinModule *kwin_module; KWinModule *twin_module;
Atom net_system_tray_selection; Atom net_system_tray_selection;
Atom net_system_tray_opcode; Atom net_system_tray_opcode;
bool m_showFrame; bool m_showFrame;

@ -23,12 +23,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#undef Bool // For enable-final #undef Bool // For enable-final
#include <klocale.h> #include <klocale.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <kconfig.h>
#include <kprocess.h> #include <kprocess.h>
#include <kshell.h> #include <kshell.h>
#include <kwin.h> #include <twin.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kapplication.h> #include <kapplication.h>
@ -57,8 +57,8 @@ DockBarExtension::DockBarExtension(const TQString& configFile, Type type,
: KPanelExtension(configFile, type, actions, parent, name) : KPanelExtension(configFile, type, actions, parent, name)
{ {
dragging_container = 0; dragging_container = 0;
kwin_module = new KWinModule(TQT_TQOBJECT(this)); twin_module = new KWinModule(TQT_TQOBJECT(this));
connect( kwin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) ); connect( twin_module, TQT_SIGNAL( windowAdded(WId) ), TQT_SLOT( windowAdded(WId) ) );
setMinimumSize(DockContainer::sz(), DockContainer::sz()); setMinimumSize(DockContainer::sz(), DockContainer::sz());
tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
loadContainerConfig(); loadContainerConfig();
@ -154,8 +154,8 @@ void DockBarExtension::windowAdded(WId win)
kdDebug() << "Could not read XClassHint of window " << win << endl; kdDebug() << "Could not read XClassHint of window " << win << endl;
return; return;
} }
/* withdrawing the window prevents kwin from managing the window, /* withdrawing the window prevents twin from managing the window,
which causes the double-launch bug (one instance from the kwin which causes the double-launch bug (one instance from the twin
session, and one from the dockbar) bug when kde is restarted */ session, and one from the dockbar) bug when kde is restarted */
if (resIconwin != win) { if (resIconwin != win) {
XWithdrawWindow( qt_xdisplay(), win, qt_xscreen() ); XWithdrawWindow( qt_xdisplay(), win, qt_xscreen() );

@ -61,7 +61,7 @@ protected:
void mouseReleaseEvent(TQMouseEvent *); void mouseReleaseEvent(TQMouseEvent *);
void mouseMoveEvent(TQMouseEvent *); void mouseMoveEvent(TQMouseEvent *);
private: private:
KWinModule* kwin_module; KWinModule* twin_module;
DockContainer::Vector containers; DockContainer::Vector containers;
// handle the dragging of applets // handle the dragging of applets

@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqwidget.h> #include <tqwidget.h>
#include <tqtooltip.h> #include <tqtooltip.h>
#include <kwin.h> #include <twin.h>
#include <tqvalidator.h> #include <tqvalidator.h>
#include <kinputdialog.h> #include <kinputdialog.h>
#include <klocale.h> #include <klocale.h>

@ -384,7 +384,7 @@
2004-06-26 Saturday 00:28 rich 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 2004-06-26 Saturday 00:10 rich
@ -698,7 +698,7 @@
2001-11-29 Thursday 19:23 rich 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) some problems)
2001-11-25 Sunday 02:03 rich 2001-11-25 Sunday 02:03 rich

@ -56,7 +56,7 @@
#include <kconfig.h> #include <kconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <kwin.h> #include <twin.h>
#include <kglobal.h> #include <kglobal.h>
#include <klocale.h> #include <klocale.h>

@ -7,7 +7,7 @@
#include <kdatepicker.h> #include <kdatepicker.h>
#include <kglobal.h> #include <kglobal.h>
#include <kwin.h> #include <twin.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kpixmap.h> #include <kpixmap.h>
#include <kpixmapeffect.h> #include <kpixmapeffect.h>

@ -58,7 +58,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h> #include <kglobal.h>
#include <kwin.h> #include <twin.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kpixmap.h> #include <kpixmap.h>
#include <kpixmapeffect.h> #include <kpixmapeffect.h>

@ -14,7 +14,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h> #include <kglobal.h>
#include <kwin.h> #include <twin.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kpixmap.h> #include <kpixmap.h>
#include <kpixmapeffect.h> #include <kpixmapeffect.h>

@ -58,7 +58,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h> #include <kglobal.h>
#include <kwin.h> #include <twin.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kpixmap.h> #include <kpixmap.h>
#include <kpixmapeffect.h> #include <kpixmapeffect.h>

@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqtooltip.h> #include <tqtooltip.h>
#include <kwindowlistmenu.h> #include <twindowlistmenu.h>
#include <klocale.h> #include <klocale.h>
#include "windowlistbutton.h" #include "windowlistbutton.h"

@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kpanelapplet.h> #include <kpanelapplet.h>
#include <dcopobject.h> #include <dcopobject.h>
#include <kwin.h> #include <twin.h>
#include "appletinfo.h" #include "appletinfo.h"
#include "container_base.h" #include "container_base.h"

@ -44,13 +44,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kglobal.h> #include <kglobal.h>
#include <kicker.h> #include <kicker.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kwin.h> #include <twin.h>
#include <klocale.h> #include <klocale.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kapplication.h> #include <kapplication.h>
#include <netwm.h> #include <netwm.h>
#include <fixx11h.h> #include <fixx11h.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include "container_base.h" #include "container_base.h"
#include "extensionmanager.h" #include "extensionmanager.h"
@ -136,8 +136,8 @@ void ExtensionContainer::init()
KWin::setState(winId(), NET::Sticky); KWin::setState(winId(), NET::Sticky);
KWin::setOnAllDesktops(winId(), true); KWin::setOnAllDesktops(winId(), true);
connect(Kicker::the()->kwinModule(), TQT_SIGNAL(strutChanged()), this, TQT_SLOT(strutChanged())); connect(Kicker::the()->twinModule(), TQT_SIGNAL(strutChanged()), this, TQT_SLOT(strutChanged()));
connect(Kicker::the()->kwinModule(), TQT_SIGNAL(currentDesktopChanged(int)), connect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
this, TQT_SLOT( currentDesktopChanged(int))); this, TQT_SLOT( currentDesktopChanged(int)));
setBackgroundOrigin(AncestorOrigin); setBackgroundOrigin(AncestorOrigin);

@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kmenubar.h> #include <kmenubar.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <dcopref.h> #include <dcopref.h>
#include "container_extension.h" #include "container_extension.h"
@ -625,7 +625,7 @@ TQRect ExtensionManager::workArea(int XineramaScreen, const ExtensionContainer*
{ {
if (!extension) if (!extension)
{ {
return Kicker::the()->kwinModule()->workArea(XineramaScreen); return Kicker::the()->twinModule()->workArea(XineramaScreen);
} }
TQValueList<WId> list; TQValueList<WId> list;
@ -676,11 +676,11 @@ TQRect ExtensionManager::workArea(int XineramaScreen, const ExtensionContainer*
if ((XineramaScreen == XineramaAllScreens) || (kapp->desktop()->numScreens() < 2)) if ((XineramaScreen == XineramaAllScreens) || (kapp->desktop()->numScreens() < 2))
{ {
/* special value for all screens */ /* special value for all screens */
workArea = Kicker::the()->kwinModule()->workArea(list); workArea = Kicker::the()->twinModule()->workArea(list);
} }
else else
{ {
workArea = Kicker::the()->kwinModule()->workArea(list, XineramaScreen) workArea = Kicker::the()->twinModule()->workArea(list, XineramaScreen)
.intersect(TQApplication::desktop()->screenGeometry(XineramaScreen)); .intersect(TQApplication::desktop()->screenGeometry(XineramaScreen));
} }

@ -42,8 +42,8 @@
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kwin.h> #include <twin.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include "extensionmanager.h" #include "extensionmanager.h"
#include "pluginmanager.h" #include "pluginmanager.h"
@ -64,7 +64,7 @@ Kicker* Kicker::the() { return static_cast<Kicker*>(kapp); }
Kicker::Kicker() Kicker::Kicker()
: KUniqueApplication(), : KUniqueApplication(),
keys(0), keys(0),
m_kwinModule(0), m_twinModule(0),
m_configDialog(0), m_configDialog(0),
m_canAddContainers(true) m_canAddContainers(true)
{ {
@ -379,14 +379,14 @@ void Kicker::clearQuickStartMenu()
MenuManager::the()->kmenu()->clearRecentMenuItems(); 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 TQRect Kicker::desktopIconsArea(int screen) const

@ -69,7 +69,7 @@ k_dcop_signals:
public: public:
static Kicker* the(); static Kicker* the();
KDirWatch* fileWatcher(); KDirWatch* fileWatcher();
KWinModule* kwinModule(); KWinModule* twinModule();
bool isImmutable() const; bool isImmutable() const;
bool isKioskImmutable() const; bool isKioskImmutable() const;
@ -122,7 +122,7 @@ private:
static void crashHandler(int signal); static void crashHandler(int signal);
KGlobalAccel* keys; KGlobalAccel* keys;
KWinModule* m_kwinModule; KWinModule* m_twinModule;
KCMultiDialog* m_configDialog; KCMultiDialog* m_configDialog;
bool m_canAddContainers; bool m_canAddContainers;
TQPoint m_insertionPoint; TQPoint m_insertionPoint;

@ -26,8 +26,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "kicker.h" #include "kicker.h"
#include "kickerSettings.h" #include "kickerSettings.h"
#include <kwin.h> #include <twin.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <netwm.h> #include <netwm.h>
#include "showdesktop.h" #include "showdesktop.h"
@ -49,9 +49,9 @@ ShowDesktop::ShowDesktop()
m_wmSupport = i.isSupported( NET::WM2ShowingDesktop ); m_wmSupport = i.isSupported( NET::WM2ShowingDesktop );
if( m_wmSupport ) if( m_wmSupport )
{ {
connect( Kicker::the()->kwinModule(), TQT_SIGNAL( showingDesktopChanged( bool )), connect( Kicker::the()->twinModule(), TQT_SIGNAL( showingDesktopChanged( bool )),
TQT_SLOT( 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) && if ((windowType == NET::Normal || windowType == NET::Unknown) &&
inf.mappingState() == NET::Visible) inf.mappingState() == NET::Visible)
{ {
KConfig kwincfg( "kwinrc", true ); // see in kwin KConfig twincfg( "twinrc", true ); // see in twin
kwincfg.setGroup( "Windows" ); twincfg.setGroup( "Windows" );
if( kwincfg.readBoolEntry( "ShowDesktopIsMinimizeAll", false )) if( twincfg.readBoolEntry( "ShowDesktopIsMinimizeAll", false ))
{ {
m_iconifiedList.clear(); m_iconifiedList.clear();
m_showingDesktop = false; m_showingDesktop = false;
@ -130,10 +130,10 @@ void ShowDesktop::showDesktop( bool b )
if (b) if (b)
{ {
m_activeWindow = Kicker::the()->kwinModule()->activeWindow(); m_activeWindow = Kicker::the()->twinModule()->activeWindow();
m_iconifiedList.clear(); 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(); for (TQValueList<WId>::ConstIterator it = windows.begin();
it != windows.end(); it != windows.end();
++it) ++it)
@ -145,7 +145,7 @@ void ShowDesktop::showDesktop( bool b )
if (info.mappingState() == NET::Visible && if (info.mappingState() == NET::Visible &&
(info.desktop() == NETWinInfo::OnAllDesktops || (info.desktop() == NETWinInfo::OnAllDesktops ||
info.desktop() == (int)Kicker::the()->kwinModule()->currentDesktop())) info.desktop() == (int)Kicker::the()->twinModule()->currentDesktop()))
{ {
m_iconifiedList.append( w ); 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 // 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))); 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))); 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))); TQT_SLOT(slotWindowAdded(WId)));
} }
else else
{ {
disconnect(Kicker::the()->kwinModule(), TQT_SIGNAL(currentDesktopChanged(int)), disconnect(Kicker::the()->twinModule(), TQT_SIGNAL(currentDesktopChanged(int)),
this, TQT_SLOT(slotCurrentDesktopChanged(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))); 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))); this, TQT_SLOT(slotWindowAdded(WId)));
for (TQValueVector<WId>::ConstIterator it = m_iconifiedList.begin(); for (TQValueVector<WId>::ConstIterator it = m_iconifiedList.begin();

@ -59,7 +59,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kwin.h> #include <twin.h>
#include <kdebug.h> #include <kdebug.h>
#include <kmimetype.h> #include <kmimetype.h>
#include <kmultipledrag.h> #include <kmultipledrag.h>

@ -50,7 +50,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <ktoolbarbutton.h> #include <ktoolbarbutton.h>
#include <kwin.h> #include <twin.h>
#include "client_mnu.h" #include "client_mnu.h"
#include "container_base.h" #include "container_base.h"

@ -58,7 +58,7 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kcombobox.h> #include <kcombobox.h>
#include <kwin.h> #include <twin.h>
#include <kdebug.h> #include <kdebug.h>
#include <kuser.h> #include <kuser.h>
#include <kurllabel.h> #include <kurllabel.h>

@ -40,7 +40,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kaboutdata.h> #include <kaboutdata.h>
#include <tqfileinfo.h> #include <tqfileinfo.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <kwin.h> #include <twin.h>
#include "appletinfo.h" #include "appletinfo.h"

@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kapplication.h> #include <kapplication.h>
#include <kdebug.h> #include <kdebug.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kwindowlistmenu.h> #include <twindowlistmenu.h>
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>

@ -1140,7 +1140,7 @@ void TaskContainer::popupMenu(int action)
} }
else if (action == TaskBarSettings::ShowOperationsMenu) else if (action == TaskBarSettings::ShowOperationsMenu)
{ {
if (!kapp->authorizeKAction("kwin_rmb")) if (!kapp->authorizeKAction("twin_rmb"))
{ {
return; return;
} }

@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <klocale.h> #include <klocale.h>
// #include <kpixmapio.h> // #include <kpixmapio.h>
#include <kstaticdeleter.h> #include <kstaticdeleter.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <kxerrorhandler.h> #include <kxerrorhandler.h>
#include <netwm.h> #include <netwm.h>

@ -39,7 +39,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <ksharedptr.h> #include <ksharedptr.h>
#include <kstartupinfo.h> #include <kstartupinfo.h>
#include <kwin.h> #include <twin.h>
#include <config.h> #include <config.h>

@ -29,7 +29,7 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <kregexpeditorinterface.h> #include <kregexpeditorinterface.h>
#include <kparts/componentfactory.h> #include <kparts/componentfactory.h>

@ -27,7 +27,7 @@
#include <klocale.h> #include <klocale.h>
#include <kaction.h> #include <kaction.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kwin.h> #include <twin.h>
#include <kapplication.h> #include <kapplication.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kdebug.h> #include <kdebug.h>

@ -23,7 +23,7 @@
#include <klocale.h> #include <klocale.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <kwin.h> #include <twin.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kuniqueapplication.h> #include <kuniqueapplication.h>

@ -46,7 +46,7 @@
#include <kstringhandler.h> #include <kstringhandler.h>
#include <ksystemtray.h> #include <ksystemtray.h>
#include <kurldrag.h> #include <kurldrag.h>
#include <kwin.h> #include <twin.h>
#include <kdebug.h> #include <kdebug.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <dcopclient.h> #include <dcopclient.h>

@ -29,7 +29,7 @@
#include <kdcoppropertyproxy.h> #include <kdcoppropertyproxy.h>
#include <kdebug.h> #include <kdebug.h>
#include <kstartupinfo.h> #include <kstartupinfo.h>
#include <kwin.h> #include <twin.h>
KonqMainWindowIface::KonqMainWindowIface( KonqMainWindow * mainWindow ) KonqMainWindowIface::KonqMainWindowIface( KonqMainWindow * mainWindow )
: :

@ -44,7 +44,7 @@
#include "kfmclient.h" #include "kfmclient.h"
#include "KonquerorIface_stub.h" #include "KonquerorIface_stub.h"
#include "KDesktopIface_stub.h" #include "KDesktopIface_stub.h"
#include "kwin.h" #include "twin.h"
#include <X11/Xlib.h> #include <X11/Xlib.h>

@ -35,7 +35,7 @@
#include <kuniqueapplication.h> #include <kuniqueapplication.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kwin.h> #include <twin.h>
#include <kbookmarkmanager.h> #include <kbookmarkmanager.h>
#include <kbookmarkexporter.h> #include <kbookmarkexporter.h>

@ -93,7 +93,7 @@
#include <kurlrequesterdlg.h> #include <kurlrequesterdlg.h>
#include <kurlrequester.h> #include <kurlrequester.h>
#include <kuserprofile.h> #include <kuserprofile.h>
#include <kwin.h> #include <twin.h>
#include <kfiledialog.h> #include <kfiledialog.h>
#include <klocale.h> #include <klocale.h>
#include <kiconloader.h> #include <kiconloader.h>
@ -5272,7 +5272,7 @@ void KonqMainWindow::updateBookmarkBar()
void KonqMainWindow::closeEvent( TQCloseEvent *e ) void KonqMainWindow::closeEvent( TQCloseEvent *e )
{ {
kdDebug(1202) << "KonqMainWindow::closeEvent begin" << endl; 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. // so let's do this only when closed by the user.
if ( static_cast<KonquerorApplication *>(kapp)->closedByUser() ) if ( static_cast<KonquerorApplication *>(kapp)->closedByUser() )
{ {

@ -28,7 +28,7 @@
#include <kurifilter.h> #include <kurifilter.h>
#include <klocale.h> #include <klocale.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kwin.h> #include <twin.h>
#include <kprotocolinfo.h> #include <kprotocolinfo.h>
#include <kurldrag.h> #include <kurldrag.h>
#include <kstartupinfo.h> #include <kstartupinfo.h>

@ -59,7 +59,7 @@ Name[pt]=Página do KDE
Name[pt_BR]=Página principal do KDE Name[pt_BR]=Página principal do KDE
Name[ro]=Site-ul KDE Name[ro]=Site-ul KDE
Name[ru]=Основной сайт KDE Name[ru]=Основной сайт KDE
Name[rw]=KDE Ipajikwinjira Name[rw]=KDE Ipajitwinjira
Name[se]=KDE-ruoktosiidu Name[se]=KDE-ruoktosiidu
Name[sk]=Domovská stránka KDE Name[sk]=Domovská stránka KDE
Name[sl]=Domača stran KDE Name[sl]=Domača stran KDE

@ -40,7 +40,7 @@
/*STATE: /*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. are all in bad need for a complete rewrite.
While the emulation core (TEmulation, TEVt102, TEScreen, TEWidget) While the emulation core (TEmulation, TEVt102, TEScreen, TEWidget)

@ -31,7 +31,7 @@
#include <ksimpleconfig.h> #include <ksimpleconfig.h>
#include <keditcl.h> #include <keditcl.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <tqstrlist.h> #include <tqstrlist.h>
#include <tqintdict.h> #include <tqintdict.h>

@ -30,8 +30,8 @@
#include <kdatastream.h> #include <kdatastream.h>
#include <kapplication.h> #include <kapplication.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <kwin.h> #include <twin.h>
#include <kconfig.h> #include <kconfig.h>
#include <kglobal.h> #include <kglobal.h>
#include <kdebug.h> #include <kdebug.h>
@ -129,7 +129,7 @@ void Desktop::mouseReleaseEvent( TQMouseEvent *ev )
KWin::WindowInfo *Desktop::windowAtPosition(const TQPoint &p, TQPoint *internalpos) KWin::WindowInfo *Desktop::windowAtPosition(const TQPoint &p, TQPoint *internalpos)
{ {
TQRect r; TQRect r;
const TQValueList<WId> &list(pager()->kwin()->stackingOrder()); const TQValueList<WId> &list(pager()->twin()->stackingOrder());
if (list.count() <= 0) if (list.count() <= 0)
return 0L; return 0L;
@ -476,9 +476,9 @@ void Desktop::paintEvent( TQPaintEvent * )
// draw text // draw text
if ( sname && snumber ) 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 ) else if ( sname )
txt=pager()->kwin()->desktopName( m_desk ); txt=pager()->twin()->desktopName( m_desk );
else if ( snumber ) else if ( snumber )
txt=TQString::number( m_desk ); txt=TQString::number( m_desk );
p.drawText(2, 0, width()-4, height(), AlignCenter, txt ); p.drawText(2, 0, width()-4, height(), AlignCenter, txt );
@ -487,8 +487,8 @@ void Desktop::paintEvent( TQPaintEvent * )
// paint windows // paint windows
if ( KPagerConfigDialog::m_showWindows ) { if ( KPagerConfigDialog::m_showWindows ) {
TQValueList<WId>::ConstIterator it; TQValueList<WId>::ConstIterator it;
for ( it = pager()->kwin()->stackingOrder().begin(); for ( it = pager()->twin()->stackingOrder().begin();
it != pager()->kwin()->stackingOrder().end(); ++it ) { it != pager()->twin()->stackingOrder().end(); ++it ) {
KWin::WindowInfo* info = pager()->info( *it ); KWin::WindowInfo* info = pager()->info( *it );
@ -519,7 +519,7 @@ void Desktop::paintWindowPlain(TQPainter &p, const KWin::WindowInfo *info, bool
if ( !onDesktop ) if ( !onDesktop )
r.moveTopLeft(TQPoint(0,0)); r.moveTopLeft(TQPoint(0,0));
bool isActive=(pager()->kwin()->activeWindow() == info->win()); bool isActive=(pager()->twin()->activeWindow() == info->win());
TQBrush brush; TQBrush brush;
@ -638,7 +638,7 @@ KPager *Desktop::pager() const
bool Desktop::isCurrent() const bool Desktop::isCurrent() const
{ {
return pager()->kwin()->currentDesktop()==m_desk; return pager()->twin()->currentDesktop()==m_desk;
} }
void Desktop::backgroundLoaded(bool b) void Desktop::backgroundLoaded(bool b)

@ -27,7 +27,7 @@
#include <tqwidget.h> #include <tqwidget.h>
#include <tqintdict.h> #include <tqintdict.h>
#include <kwin.h> #include <twin.h>
class KSharedPixmap; class KSharedPixmap;
class KPopupMenu; class KPopupMenu;

@ -50,8 +50,8 @@
#include <kconfig.h> #include <kconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <klocale.h> #include <klocale.h>
#include <kwin.h> #include <twin.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <netwm.h> #include <netwm.h>
#include "desktop.h" #include "desktop.h"
#include <tqpopupmenu.h> #include <tqpopupmenu.h>
@ -495,7 +495,7 @@ void KPager::slotDesktopNamesChanged()
for ( int i=1; i <= (int) m_desktops.count(); ++i) for ( int i=1; i <= (int) m_desktops.count(); ++i)
{ {
TQToolTip::remove(m_desktops[i-1]); 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(); update();
@ -530,7 +530,7 @@ void KPager::slotNumberOfDesktopsChanged(int ndesktops)
for (unsigned int d=m_desktops.count()+1;d<=nDesktops; d++) 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); m_desktops.append(dsk);
dsk->show(); dsk->show();
} }

@ -28,7 +28,7 @@
#include <tqwidget.h> #include <tqwidget.h>
#include <tqintdict.h> #include <tqintdict.h>
#include <kmainwindow.h> #include <kmainwindow.h>
#include <kwin.h> #include <twin.h>
#include "kpagerIface.h" #include "kpagerIface.h"
class KPager; class KPager;
@ -67,7 +67,7 @@ public:
KPager(KPagerMainWindow *parent=0, const char *name=0); KPager(KPagerMainWindow *parent=0, const char *name=0);
~KPager(); ~KPager();
class KWinModule *kwin() const { return m_winmodule; }; class KWinModule *twin() const { return m_winmodule; };
void updateLayout(); void updateLayout();
void redrawDesktops(); void redrawDesktops();

@ -105,7 +105,7 @@ MacOS:
- Mac- Keyboard-Scheme - Mac- Keyboard-Scheme
- use 2 clipboards for c&p (keyboard/mouse) (default) - use 2 clipboards for c&p (keyboard/mouse) (default)
- Window-Behavior -> Focus on click - 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 - Menubar on top
- WindowList-menu on MMB - WindowList-menu on MMB
- Walk trough windows mode: KDE - Walk trough windows mode: KDE

@ -49,8 +49,8 @@
KEyeCandyPage::KEyeCandyPage(TQWidget *parent, const char *name ) : KEyeCandyPageDlg(parent,name) { KEyeCandyPage::KEyeCandyPage(TQWidget *parent, const char *name ) : KEyeCandyPageDlg(parent,name) {
kwinconf = new KConfig("kwinrc", false, true); twinconf = new KConfig("twinrc", false, true);
kwineventconf = new KConfig("kwin.eventsrc", false, false); twineventconf = new KConfig("twin.eventsrc", false, false);
kickerconf = new KConfig("kickerrc",false, false); kickerconf = new KConfig("kickerrc",false, false);
konquerorconf = new KConfig("konquerorrc",false, false); konquerorconf = new KConfig("konquerorrc",false, false);
konqiconconf = new KConfig("konqiconviewrc",false,false); konqiconconf = new KConfig("konqiconviewrc",false,false);
@ -131,8 +131,8 @@ KEyeCandyPage::KEyeCandyPage(TQWidget *parent, const char *name ) : KEyeCandyPag
} }
KEyeCandyPage::~KEyeCandyPage(){ KEyeCandyPage::~KEyeCandyPage(){
delete kwinconf; delete twinconf;
delete kwineventconf; delete twineventconf;
delete kickerconf; delete kickerconf;
delete konquerorconf; delete konquerorconf;
delete konqiconconf; delete konqiconconf;
@ -305,17 +305,17 @@ void KEyeCandyPage::enableDesktopWindowEffects(bool enable,bool restore){
// -Animate shade // -Animate shade
// -Enable Hover // -Enable Hover
//-Enable move/resize on maximised windows //-Enable move/resize on maximised windows
kwinconf->setGroup( "Windows" ); twinconf->setGroup( "Windows" );
if(!restore){ if(!restore){
kwinconf->writeEntry("AnimateMinimize", enable ); twinconf->writeEntry("AnimateMinimize", enable );
kwinconf->writeEntry("AnimateShade", enable ); twinconf->writeEntry("AnimateShade", enable );
kwinconf->writeEntry("MoveResizeMaximizedWindows",enable); twinconf->writeEntry("MoveResizeMaximizedWindows",enable);
kwinconf->writeEntry("ShadeHover", enable ); twinconf->writeEntry("ShadeHover", enable );
} else { } else {
kwinconf->writeEntry("AnimateMinimize", b_AnimateMinimize ); twinconf->writeEntry("AnimateMinimize", b_AnimateMinimize );
kwinconf->writeEntry("AnimateShade", b_AnimateShade ); twinconf->writeEntry("AnimateShade", b_AnimateShade );
kwinconf->writeEntry("MoveResizeMaximizedWindows",b_MoveResizeMaximizedWindows); twinconf->writeEntry("MoveResizeMaximizedWindows",b_MoveResizeMaximizedWindows);
kwinconf->writeEntry("ShadeHover", b_ShadeHover); twinconf->writeEntry("ShadeHover", b_ShadeHover);
} }
} }
@ -326,20 +326,20 @@ void KEyeCandyPage::enableDesktopWindowMovingContents(bool enable, bool restore)
// -Display content in resizing window // -Display content in resizing window
// And KGlobalSettings::opaqueResize() for QSplitters // And KGlobalSettings::opaqueResize() for QSplitters
kwinconf->setGroup( "Windows" ); twinconf->setGroup( "Windows" );
KGlobal::config()->setGroup("KDE"); KGlobal::config()->setGroup("KDE");
if (enable){ if (enable){
kwinconf->writeEntry("ResizeMode","Opaque"); twinconf->writeEntry("ResizeMode","Opaque");
kwinconf->writeEntry("MoveMode","Opaque"); twinconf->writeEntry("MoveMode","Opaque");
KGlobal::config()->writeEntry("OpaqueResize", true, true, true); KGlobal::config()->writeEntry("OpaqueResize", true, true, true);
} else { } else {
kwinconf->writeEntry("ResizeMode","Transparent"); twinconf->writeEntry("ResizeMode","Transparent");
kwinconf->writeEntry("MoveMode","Transparent"); twinconf->writeEntry("MoveMode","Transparent");
KGlobal::config()->writeEntry("OpaqueResize", false, true, true); KGlobal::config()->writeEntry("OpaqueResize", false, true, true);
} }
if(restore){ if(restore){
kwinconf->writeEntry("ResizeMode",s_ResizeMode); twinconf->writeEntry("ResizeMode",s_ResizeMode);
kwinconf->writeEntry("MoveMode",s_MoveMode); twinconf->writeEntry("MoveMode",s_MoveMode);
KGlobal::config()->writeEntry("OpaqueResize", b_OpaqueResize, true, true); KGlobal::config()->writeEntry("OpaqueResize", b_OpaqueResize, true, true);
} }
} }
@ -547,49 +547,49 @@ void KEyeCandyPage::enablePreview(bool currSettings){
//----------------------------OTHER STUFF------------------------------------------------- //----------------------------OTHER STUFF-------------------------------------------------
/** Enables the default KDE sound scheme in Level 3 */ /** Enables the default KDE sound scheme in Level 3 */
void KEyeCandyPage::enableSoundScheme(bool enable, bool user) { void KEyeCandyPage::enableSoundScheme(bool enable, bool user) {
kwineventconf->setGroup("desktop1"); twineventconf->setGroup("desktop1");
kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop1 : 0) ); twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop1 : 0) );
kwineventconf->setGroup("desktop2"); twineventconf->setGroup("desktop2");
kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop2 : 0) ); twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop2 : 0) );
kwineventconf->setGroup("desktop3"); twineventconf->setGroup("desktop3");
kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop3 : 0) ); twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop3 : 0) );
kwineventconf->setGroup("desktop4"); twineventconf->setGroup("desktop4");
kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop4 : 0) ); twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop4 : 0) );
kwineventconf->setGroup("desktop5"); twineventconf->setGroup("desktop5");
kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop5 : 0) ); twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop5 : 0) );
kwineventconf->setGroup("desktop6"); twineventconf->setGroup("desktop6");
kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop6 : 0) ); twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop6 : 0) );
kwineventconf->setGroup("desktop7"); twineventconf->setGroup("desktop7");
kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop7 : 0) ); twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop7 : 0) );
kwineventconf->setGroup("desktop8"); twineventconf->setGroup("desktop8");
kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop8 : 0) ); twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.desktop8 : 0) );
kwineventconf->setGroup("new"); twineventconf->setGroup("new");
kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.notold : 0) ); twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.notold : 0) );
kwineventconf->setGroup("close"); twineventconf->setGroup("close");
kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.close : 0) ); twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.close : 0) );
kwineventconf->setGroup("transnew"); twineventconf->setGroup("transnew");
kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.transnew : 0) ); twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.transnew : 0) );
kwineventconf->setGroup("transdelete"); twineventconf->setGroup("transdelete");
kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.transdelete : 0) ); twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.transdelete : 0) );
kwineventconf->setGroup("iconify"); twineventconf->setGroup("iconify");
kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.iconify : 0) ); twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.iconify : 0) );
kwineventconf->setGroup("deiconify"); twineventconf->setGroup("deiconify");
kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.deiconify : 0) ); twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.deiconify : 0) );
kwineventconf->setGroup("maximize"); twineventconf->setGroup("maximize");
kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.maximize : 0) ); twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.maximize : 0) );
kwineventconf->setGroup("unmaximize"); twineventconf->setGroup("unmaximize");
kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.unmaximize : 0) ); twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.unmaximize : 0) );
kwineventconf->setGroup("shadeup"); twineventconf->setGroup("shadeup");
kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.shadeup : 0) ); twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.shadeup : 0) );
kwineventconf->setGroup("shadedown"); twineventconf->setGroup("shadedown");
kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.shadedown : 0) ); twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.shadedown : 0) );
kwineventconf->setGroup("sticky"); twineventconf->setGroup("sticky");
kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.sticky : 0) ); twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.sticky : 0) );
kwineventconf->setGroup("unsticky"); twineventconf->setGroup("unsticky");
kwineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.unsticky : 0) ); twineventconf->writeEntry("presentation", enable ? 1 : (user ? st_UserSnd.unsticky : 0) );
} }
/** Enable Antialiased fonts. Enable in Level 7. */ /** 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. // currSettings==true: save selections. currSettings==false: save user-def.
saveCheckState(currSettings); saveCheckState(currSettings);
// save all the KConfig-objects to their respective files // save all the KConfig-objects to their respective files
kwinconf->sync(); twinconf->sync();
kwineventconf->sync(); twineventconf->sync();
konquerorconf->sync(); konquerorconf->sync();
konqiconconf->sync(); konqiconconf->sync();
kickerconf->sync(); kickerconf->sync();
kdesktopconf->sync(); kdesktopconf->sync();
KGlobal::config()->sync(); KGlobal::config()->sync();
// restart kwin for window effects // restart twin for window effects
kapp->dcopClient()->send("knotify", "Notify", "reconfigure()", TQString("")); 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) // set the display options (style effects)
KIPC::sendMessageAll(KIPC::SettingsChanged); KIPC::sendMessageAll(KIPC::SettingsChanged);
TQApplication::syncX(); TQApplication::syncX();
@ -730,63 +730,63 @@ void KEyeCandyPage::getUserDefaults(){
konq_dont_prev=konqiconconf->readListEntry("DontPreview"); konq_dont_prev=konqiconconf->readListEntry("DontPreview");
b_konq_prev_sound=konqiconconf->readBoolEntry("EnableSoundPreviews", false); b_konq_prev_sound=konqiconconf->readBoolEntry("EnableSoundPreviews", false);
b_konq_prev_enable=konqiconconf->readBoolEntry("PreviewsEnabled", true); b_konq_prev_enable=konqiconconf->readBoolEntry("PreviewsEnabled", true);
kwinconf->setGroup( "Windows" ); twinconf->setGroup( "Windows" );
s_ResizeMode=kwinconf->readEntry("ResizeMode", "Transparent"); s_ResizeMode=twinconf->readEntry("ResizeMode", "Transparent");
s_MoveMode=kwinconf->readEntry("MoveMode", "Opaque"); s_MoveMode=twinconf->readEntry("MoveMode", "Opaque");
b_AnimateMinimize=kwinconf->readBoolEntry("AnimateMinimize", true ); b_AnimateMinimize=twinconf->readBoolEntry("AnimateMinimize", true );
b_AnimateShade=kwinconf->readBoolEntry("AnimateShade", true ); b_AnimateShade=twinconf->readBoolEntry("AnimateShade", true );
b_MoveResizeMaximizedWindows=kwinconf->readBoolEntry("MoveResizeMaximizedWindows",true); b_MoveResizeMaximizedWindows=twinconf->readBoolEntry("MoveResizeMaximizedWindows",true);
b_ShadeHover = kwinconf->readBoolEntry("ShadeHover", false); b_ShadeHover = twinconf->readBoolEntry("ShadeHover", false);
getUserSoundScheme(); getUserSoundScheme();
} }
/** gets the users sound-settings */ /** gets the users sound-settings */
void KEyeCandyPage::getUserSoundScheme() { void KEyeCandyPage::getUserSoundScheme() {
kwineventconf->setGroup("desktop1"); twineventconf->setGroup("desktop1");
st_UserSnd.desktop1 = kwineventconf->readNumEntry("presentation", 0); st_UserSnd.desktop1 = twineventconf->readNumEntry("presentation", 0);
kwineventconf->setGroup("desktop2"); twineventconf->setGroup("desktop2");
st_UserSnd.desktop2 = kwineventconf->readNumEntry("presentation", 0); st_UserSnd.desktop2 = twineventconf->readNumEntry("presentation", 0);
kwineventconf->setGroup("desktop3"); twineventconf->setGroup("desktop3");
st_UserSnd.desktop3 = kwineventconf->readNumEntry("presentation", 0); st_UserSnd.desktop3 = twineventconf->readNumEntry("presentation", 0);
kwineventconf->setGroup("desktop4"); twineventconf->setGroup("desktop4");
st_UserSnd.desktop4 = kwineventconf->readNumEntry("presentation", 0); st_UserSnd.desktop4 = twineventconf->readNumEntry("presentation", 0);
kwineventconf->setGroup("desktop5"); twineventconf->setGroup("desktop5");
st_UserSnd.desktop5 = kwineventconf->readNumEntry("presentation", 0); st_UserSnd.desktop5 = twineventconf->readNumEntry("presentation", 0);
kwineventconf->setGroup("desktop6"); twineventconf->setGroup("desktop6");
st_UserSnd.desktop6 = kwineventconf->readNumEntry("presentation", 0); st_UserSnd.desktop6 = twineventconf->readNumEntry("presentation", 0);
kwineventconf->setGroup("desktop7"); twineventconf->setGroup("desktop7");
st_UserSnd.desktop7 = kwineventconf->readNumEntry("presentation", 0); st_UserSnd.desktop7 = twineventconf->readNumEntry("presentation", 0);
kwineventconf->setGroup("desktop8"); twineventconf->setGroup("desktop8");
st_UserSnd.desktop8 = kwineventconf->readNumEntry("presentation", 0); st_UserSnd.desktop8 = twineventconf->readNumEntry("presentation", 0);
kwineventconf->setGroup("new"); twineventconf->setGroup("new");
st_UserSnd.notold = kwineventconf->readNumEntry("presentation", 0); st_UserSnd.notold = twineventconf->readNumEntry("presentation", 0);
kwineventconf->setGroup("close"); twineventconf->setGroup("close");
st_UserSnd.close = kwineventconf->readNumEntry("presentation", 0); st_UserSnd.close = twineventconf->readNumEntry("presentation", 0);
kwineventconf->setGroup("transnew"); twineventconf->setGroup("transnew");
st_UserSnd.transnew = kwineventconf->readNumEntry("presentation", 0); st_UserSnd.transnew = twineventconf->readNumEntry("presentation", 0);
kwineventconf->setGroup("transdelete"); twineventconf->setGroup("transdelete");
st_UserSnd.transdelete = kwineventconf->readNumEntry("presentation", 0); st_UserSnd.transdelete = twineventconf->readNumEntry("presentation", 0);
kwineventconf->setGroup("iconify"); twineventconf->setGroup("iconify");
st_UserSnd.iconify = kwineventconf->readNumEntry("presentation", 0 ); st_UserSnd.iconify = twineventconf->readNumEntry("presentation", 0 );
kwineventconf->setGroup("deiconify"); twineventconf->setGroup("deiconify");
st_UserSnd.deiconify = kwineventconf->readNumEntry("presentation", 0); st_UserSnd.deiconify = twineventconf->readNumEntry("presentation", 0);
kwineventconf->setGroup("maximize"); twineventconf->setGroup("maximize");
st_UserSnd.maximize = kwineventconf->readNumEntry("presentation", 0); st_UserSnd.maximize = twineventconf->readNumEntry("presentation", 0);
kwineventconf->setGroup("unmaximize"); twineventconf->setGroup("unmaximize");
st_UserSnd.unmaximize = kwineventconf->readNumEntry("presentation", 0); st_UserSnd.unmaximize = twineventconf->readNumEntry("presentation", 0);
kwineventconf->setGroup("shadeup"); twineventconf->setGroup("shadeup");
st_UserSnd.shadeup = kwineventconf->readNumEntry("presentation", 0); st_UserSnd.shadeup = twineventconf->readNumEntry("presentation", 0);
kwineventconf->setGroup("shadedown"); twineventconf->setGroup("shadedown");
st_UserSnd.shadedown = kwineventconf->readNumEntry("presentation", 0); st_UserSnd.shadedown = twineventconf->readNumEntry("presentation", 0);
kwineventconf->setGroup("sticky"); twineventconf->setGroup("sticky");
st_UserSnd.sticky = kwineventconf->readNumEntry("presentation", 0); st_UserSnd.sticky = twineventconf->readNumEntry("presentation", 0);
kwineventconf->setGroup("unsticky"); twineventconf->setGroup("unsticky");
st_UserSnd.unsticky = kwineventconf->readNumEntry("presentation", 0); st_UserSnd.unsticky = twineventconf->readNumEntry("presentation", 0);
} }
/** calls all enable functions with the state of the checkboxes. This is needed for save() only, /** calls all enable functions with the state of the checkboxes. This is needed for save() only,

@ -179,8 +179,8 @@ private:
} st_UserSnd; } st_UserSnd;
// DEFAULT VALLUES SET BY USER (END) // DEFAULT VALLUES SET BY USER (END)
KConfig* kwinconf; KConfig* twinconf;
KConfig* kwineventconf; KConfig* twineventconf;
KConfig* kickerconf; KConfig* kickerconf;
KConfig* konquerorconf; KConfig* konquerorconf;
KConfig* konqiconconf; KConfig* konqiconconf;

@ -43,7 +43,7 @@ KOSPage::KOSPage(TQWidget *parent, const char *name ) : KOSPageDlg(parent,name)
// Set the configfiles // Set the configfiles
cglobal = new KConfig("kdeglobals"); cglobal = new KConfig("kdeglobals");
claunch = new KConfig("klaunchrc", false, false); claunch = new KConfig("klaunchrc", false, false);
cwin = new KConfig("kwinrc"); cwin = new KConfig("twinrc");
cdesktop = new KConfig("kdesktoprc"); cdesktop = new KConfig("kdesktoprc");
ckcminput = new KConfig("kcminputrc"); ckcminput = new KConfig("kcminputrc");
ckcmdisplay = new KConfig("kcmdisplayrc"); ckcmdisplay = new KConfig("kcmdisplayrc");
@ -92,8 +92,8 @@ void KOSPage::save(bool currSettings){
// Tell kdesktop about the new config file // Tell kdesktop about the new config file
kapp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", TQByteArray()); kapp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", TQByteArray());
/////////////////////////////////////////// ///////////////////////////////////////////
/// restart kwin for window effects /// restart twin for window effects
kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
/////////////////////////////////////////// ///////////////////////////////////////////
// Make the kaccess daemon read the changed config file // Make the kaccess daemon read the changed config file

@ -78,9 +78,9 @@ KStylePage::KStylePage(TQWidget *parent, const char *name ) : KStylePageDlg(pare
connect(klv_styles, TQT_SIGNAL(selectionChanged()), connect(klv_styles, TQT_SIGNAL(selectionChanged()),
this, TQT_SLOT(slotCurrentChanged())); this, TQT_SLOT(slotCurrentChanged()));
// Note: if the default is changed here it needs to be changed in kdebase/kwin/plugins.cpp // Note: if the default is changed here it needs to be changed in kdebase/twin/plugins.cpp
// and kdebase/kwin/kcmkwin/kwindecoration/kwindecoration.cpp as well. // and kdebase/twin/kcmtwin/twindecoration/twindecoration.cpp as well.
defaultKWinStyle = TQPixmap::defaultDepth() > 8 ? "kwin_plastik" : "kwin_quartz"; defaultKWinStyle = TQPixmap::defaultDepth() > 8 ? "twin_plastik" : "twin_quartz";
appliedStyle = NULL; appliedStyle = NULL;
getAvailability(); getAvailability();
@ -89,7 +89,7 @@ KStylePage::KStylePage(TQWidget *parent, const char *name ) : KStylePageDlg(pare
} }
KStylePage::~KStylePage(){ KStylePage::~KStylePage(){
delete ckwin; delete ctwin;
delete appliedStyle; delete appliedStyle;
} }
@ -115,39 +115,39 @@ void KStylePage::saveStyle(bool curSettings){
/** save the KWin-style*/ /** save the KWin-style*/
void KStylePage::saveKWin(bool curSettings){ void KStylePage::saveKWin(bool curSettings){
TQString kwin = origKWinStyle; TQString twin = origKWinStyle;
if(curSettings) { if(curSettings) {
KDesktopFile* kdf = 0L; KDesktopFile* kdf = 0L;
KStandardDirs* kstd = KGlobal::dirs(); KStandardDirs* kstd = KGlobal::dirs();
if (cde->isSelected() && kwin_cde_exist) if (cde->isSelected() && twin_cde_exist)
kdf = new KDesktopFile(kstd->findResource("data", "kwin/cde.desktop")); kdf = new KDesktopFile(kstd->findResource("data", "twin/cde.desktop"));
else if (win->isSelected() && kwin_win_exist) else if (win->isSelected() && twin_win_exist)
kdf = new KDesktopFile(kstd->findResource("data", "kwin/redmond.desktop")); kdf = new KDesktopFile(kstd->findResource("data", "twin/redmond.desktop"));
else if (platinum->isSelected() && kwin_system_exist) else if (platinum->isSelected() && twin_system_exist)
kdf = new KDesktopFile(kstd->findResource("data", "kwin/system.desktop")); kdf = new KDesktopFile(kstd->findResource("data", "twin/system.desktop"));
else if (keramik->isSelected() && kwin_keramik_exist) else if (keramik->isSelected() && twin_keramik_exist)
kdf = new KDesktopFile(kstd->findResource("data", "kwin/keramik.desktop")); kdf = new KDesktopFile(kstd->findResource("data", "twin/keramik.desktop"));
else if (kde->isSelected()) { else if (kde->isSelected()) {
if (kwin_plastik_exist && (TQColor::numBitPlanes() > 8)) if (twin_plastik_exist && (TQColor::numBitPlanes() > 8))
kdf = new KDesktopFile(kstd->findResource("data", "kwin/plastik.desktop")); kdf = new KDesktopFile(kstd->findResource("data", "twin/plastik.desktop"));
else if (kwin_quartz_exist) else if (twin_quartz_exist)
kdf = new KDesktopFile(kstd->findResource("data", "kwin/quartz.desktop")); kdf = new KDesktopFile(kstd->findResource("data", "twin/quartz.desktop"));
} }
if (kdf) { if (kdf) {
kdf->setGroup("Desktop Entry"); kdf->setGroup("Desktop Entry");
kwin = kdf->readEntry("X-KDE-Library", defaultKWinStyle); twin = kdf->readEntry("X-KDE-Library", defaultKWinStyle);
delete kdf; delete kdf;
} }
else { else {
// if we get here classic is selected (there's no .desktop file for the // 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. // kde2 twin style), or none of the other twin styles were found.
kwin = "kwin_default"; twin = "twin_default";
} }
} }
ckwin->writeEntry("PluginLib", kwin); ctwin->writeEntry("PluginLib", twin);
ckwin->sync(); ctwin->sync();
kdDebug() << "KStylePage::saveKWin(): " << kwin << endl; kdDebug() << "KStylePage::saveKWin(): " << twin << endl;
} }
/** Save the color-scheme */ /** Save the color-scheme */
@ -411,7 +411,7 @@ void KStylePage::getColors(colorSet *set, bool colorfile ){
delete config; delete config;
} }
/** Test widget- and kwin- styles for availability */ /** Test widget- and twin- styles for availability */
void KStylePage::getAvailability() { void KStylePage::getAvailability() {
// test, wich styles are available // test, wich styles are available
kde_keramik_exist = kde_hc_exist = kde_def_exist = cde_exist kde_keramik_exist = kde_hc_exist = kde_def_exist = cde_exist
@ -436,23 +436,23 @@ void KStylePage::getAvailability() {
if (!platinum_exist) platinum->tqsetVisible(false); if (!platinum_exist) platinum->tqsetVisible(false);
// test, wich KWin-styles are available // test, wich KWin-styles are available
kwin_keramik_exist = kwin_system_exist = kwin_plastik_exist twin_keramik_exist = twin_system_exist = twin_plastik_exist
= kwin_default_exist = kwin_win_exist = twin_default_exist = twin_win_exist
= kwin_cde_exist = kwin_quartz_exist = false; = twin_cde_exist = twin_quartz_exist = false;
KStandardDirs* kstd = KGlobal::dirs(); KStandardDirs* kstd = KGlobal::dirs();
if (!kstd->findResource("data", "kwin/keramik.desktop").isNull()) if (!kstd->findResource("data", "twin/keramik.desktop").isNull())
kwin_keramik_exist = true; twin_keramik_exist = true;
if (!kstd->findResource("data", "kwin/plastik.desktop").isNull()) if (!kstd->findResource("data", "twin/plastik.desktop").isNull())
kwin_plastik_exist = true; twin_plastik_exist = true;
if (!kstd->findResource("data", "kwin/system.desktop").isNull()) if (!kstd->findResource("data", "twin/system.desktop").isNull())
kwin_system_exist = true; twin_system_exist = true;
if (!kstd->findResource("data", "kwin/redmond.desktop").isNull()) if (!kstd->findResource("data", "twin/redmond.desktop").isNull())
kwin_win_exist = true; twin_win_exist = true;
if (!kstd->findResource("data", "kwin/cde.desktop").isNull()) if (!kstd->findResource("data", "twin/cde.desktop").isNull())
kwin_cde_exist = true; twin_cde_exist = true;
if (!kstd->findResource("data", "kwin/quartz.desktop").isNull()) if (!kstd->findResource("data", "twin/quartz.desktop").isNull())
kwin_quartz_exist = true; twin_quartz_exist = true;
kwin_default_exist = true; // we can't check for a .desktop-file for the old default because there is none 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 // check, wich Icon-themes are available
icon_crystalsvg_exist = icon_kdeclassic_exist = icon_Locolor_exist = false; icon_crystalsvg_exist = icon_kdeclassic_exist = icon_Locolor_exist = false;
@ -473,9 +473,9 @@ void KStylePage::getUserDefaults() {
origStyle = KGlobal::config()->readEntry( "widgetStyle", KStyle::defaultStyle() ); origStyle = KGlobal::config()->readEntry( "widgetStyle", KStyle::defaultStyle() );
// get the user's current KWin-style // get the user's current KWin-style
ckwin = new KConfig("kwinrc"); ctwin = new KConfig("twinrc");
ckwin->setGroup("Style"); ctwin->setGroup("Style");
origKWinStyle = ckwin->readEntry("PluginLib", defaultKWinStyle); origKWinStyle = ctwin->readEntry("PluginLib", defaultKWinStyle);
// get the users current colors // get the users current colors
getColors(&usrColors, false); getColors(&usrColors, false);
@ -521,8 +521,8 @@ void KStylePage::liveUpdate() {
KIPC::sendMessageAll(KIPC::StyleChanged); KIPC::sendMessageAll(KIPC::StyleChanged);
// color palette changes // color palette changes
KIPC::sendMessageAll(KIPC::PaletteChanged); KIPC::sendMessageAll(KIPC::PaletteChanged);
// kwin-style // twin-style
kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
// kdesktop-background // kdesktop-background
kapp->dcopClient()->send("kdesktop", "KBackgroundIface", "configure()", TQString("")); kapp->dcopClient()->send("kdesktop", "KBackgroundIface", "configure()", TQString(""));
} }

@ -44,7 +44,7 @@ private:
TQString origIcons; TQString origIcons;
TQString defaultKWinStyle; TQString defaultKWinStyle;
TQString currentStyle; TQString currentStyle;
KConfig* ckwin; KConfig* ctwin;
struct colorSet { struct colorSet {
TQString colorFile, bgMode; TQString colorFile, bgMode;
int contrast; int contrast;
@ -96,9 +96,9 @@ private:
bool kde_hc_exist, kde_def_exist, kde_keramik_exist, kde_light_exist, bool kde_hc_exist, kde_def_exist, kde_keramik_exist, kde_light_exist,
cde_exist, win_exist, platinum_exist, kde_plastik_exist; cde_exist, win_exist, platinum_exist, kde_plastik_exist;
// kwin-style-existence // twin-style-existence
bool kwin_keramik_exist, kwin_default_exist, kwin_system_exist, bool twin_keramik_exist, twin_default_exist, twin_system_exist,
kwin_win_exist, kwin_cde_exist, kwin_quartz_exist, kwin_plastik_exist; twin_win_exist, twin_cde_exist, twin_quartz_exist, twin_plastik_exist;
// icon-theme-existence // icon-theme-existence
bool icon_crystalsvg_exist, icon_kdeclassic_exist, icon_Locolor_exist; bool icon_crystalsvg_exist, icon_kdeclassic_exist, icon_Locolor_exist;

@ -25,8 +25,8 @@
#include <kapplication.h> #include <kapplication.h>
#include <kimageeffect.h> #include <kimageeffect.h>
#include <kpixmapio.h> #include <kpixmapio.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <kwin.h> #include <twin.h>
#include <kdebug.h> #include <kdebug.h>
#include <netwm.h> #include <netwm.h>
#include <dcopclient.h> #include <dcopclient.h>
@ -46,7 +46,7 @@ class KRootBackingData
public: public:
TQWidget *toplevel; TQWidget *toplevel;
#ifdef Q_WS_X11 #ifdef Q_WS_X11
KWinModule *kwin; KWinModule *twin;
#endif #endif
}; };
@ -71,7 +71,7 @@ void KRootBacking::init()
#ifdef Q_WS_X11 #ifdef Q_WS_X11
connect(m_pPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool))); connect(m_pPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool)));
d->kwin = new KWinModule( this ); d->twin = new KWinModule( this );
#endif #endif
m_bInit = true; m_bInit = true;

@ -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 -r, --restore Restores the previous session if available
-w, --windowmanager <wm> Starts 'wm' in case no other window manager is -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 The default 'startkde' launches 'ksmserver --restore'. The
'windowmanager' option is useful for users that prefer a window '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 in the session (it has to remember window positions and states), it is
usually restarted when the session is restored. To be *really* sure usually restarted when the session is restored. To be *really* sure
that this happens, even if the wm might have crashed during the that this happens, even if the wm might have crashed during the

@ -50,7 +50,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kconfig.h> #include <kconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
@ -239,7 +239,7 @@ void KSMServer::restoreLegacySession( KConfig* config )
if( config->hasGroup( "Legacy" + sessionGroup )) { if( config->hasGroup( "Legacy" + sessionGroup )) {
KConfigGroupSaver saver( config, "Legacy" + sessionGroup ); KConfigGroupSaver saver( config, "Legacy" + sessionGroup );
restoreLegacySessionInternal( config ); 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 ); KConfigGroupSaver saver( config, sessionGroup );
int count = config->readNumEntry( "count", 0 ); int count = config->readNumEntry( "count", 0 );
for ( int i = 1; i <= count; i++ ) { for ( int i = 1; i <= count; i++ ) {

@ -34,7 +34,7 @@ static const KCmdLineOptions options[] =
{ "r", 0, 0 }, { "r", 0, 0 },
{ "restore", I18N_NOOP("Restores the saved user session if available"), 0}, { "restore", I18N_NOOP("Restores the saved user session if available"), 0},
{ "w", 0, 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}, { "nolocal", I18N_NOOP("Also allow remote connections"), 0},
KCmdLineLastOption KCmdLineLastOption
}; };
@ -204,7 +204,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char* argv[] )
TQCString wm = args->getOption("windowmanager"); TQCString wm = args->getOption("windowmanager");
if ( wm.isEmpty() ) if ( wm.isEmpty() )
wm = "kwin"; wm = "twin";
bool only_local = args->isSet("local"); bool only_local = args->isSet("local");
#ifndef HAVE__ICETRANSNOLISTEN #ifndef HAVE__ICETRANSNOLISTEN

@ -911,9 +911,9 @@ bool KSMServer::isWM( const TQString& program ) const
{ {
// KWin relies on ksmserver's special treatment in phase1, // KWin relies on ksmserver's special treatment in phase1,
// therefore make sure it's recognized even if ksmserver // 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 // it later
return ((program == wm) || (program == "kwin")); return ((program == wm) || (program == "twin"));
} }
bool KSMServer::isCM( const KSMClient* client ) const bool KSMServer::isCM( const KSMClient* client ) const

@ -37,7 +37,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
#include <kguiitem.h> #include <kguiitem.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kwin.h> #include <twin.h>
#include <kuser.h> #include <kuser.h>
#include <kpixmap.h> #include <kpixmap.h>
#include <kimageeffect.h> #include <kimageeffect.h>

@ -76,7 +76,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kprocess.h> #include <kprocess.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <dcopref.h> #include <dcopref.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <knotifyclient.h> #include <knotifyclient.h>
#include "server.h" #include "server.h"

@ -37,7 +37,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
#include <kguiitem.h> #include <kguiitem.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kwin.h> #include <twin.h>
#include <kuser.h> #include <kuser.h>
#include <kpixmap.h> #include <kpixmap.h>
#include <kimageeffect.h> #include <kimageeffect.h>

@ -19,7 +19,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kdebug.h> #include <kdebug.h>
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kwin.h> #include <twin.h>
#include <tqdesktopwidget.h> #include <tqdesktopwidget.h>
#include <tqhbox.h> #include <tqhbox.h>

@ -16,7 +16,7 @@
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kprogress.h> #include <kprogress.h>
#include <kwin.h> #include <twin.h>
#include <tqdesktopwidget.h> #include <tqdesktopwidget.h>
#include <tqhbox.h> #include <tqhbox.h>

@ -18,7 +18,7 @@
#include <kconfig.h> #include <kconfig.h>
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h> #include <kglobal.h>
#include <kwin.h> #include <twin.h>
#include <tqevent.h> #include <tqevent.h>
#include <tqfile.h> #include <tqfile.h>

@ -21,7 +21,7 @@
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <ktrader.h> #include <ktrader.h>
#include <kwin.h> #include <twin.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <tqdir.h> #include <tqdir.h>

@ -19,8 +19,8 @@
#include <kdebug.h> #include <kdebug.h>
#include <kprocess.h> #include <kprocess.h>
#include <klocale.h> #include <klocale.h>
#include <kwin.h> #include <twin.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <kapplication.h> #include <kapplication.h>
#include <kaboutdata.h> #include <kaboutdata.h>
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
@ -43,7 +43,7 @@ static bool fullscreen = false;
static unsigned long state = 0; static unsigned long state = 0;
static unsigned long mask = 0; static unsigned long mask = 0;
static NET::WindowType windowtype = NET::Unknown; static NET::WindowType windowtype = NET::Unknown;
static KWinModule* kwinmodule; static KWinModule* twinmodule;
KStart::KStart() KStart::KStart()
:TQObject() :TQObject()
@ -55,9 +55,9 @@ KStart::KStart()
sendRule(); sendRule();
else { else {
// connect to window add to get the NEW windows // 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) if (windowtitle != 0)
kwinmodule->doNotManage( windowtitle ); twinmodule->doNotManage( windowtitle );
} }
// propagate the app startup notification info to the started app // propagate the app startup notification info to the started app
KStartupInfoId id; KStartupInfoId id;
@ -97,7 +97,7 @@ void KStart::sendRule() {
// accept only "normal" windows // accept only "normal" windows
message += "types=" + TQCString().setNum( NET::NormalMask | NET::DialogMask ) + "\n"; message += "types=" + TQCString().setNum( NET::NormalMask | NET::DialogMask ) + "\n";
} }
if ( ( desktop > 0 && desktop <= kwinmodule->numberOfDesktops() ) if ( ( desktop > 0 && desktop <= twinmodule->numberOfDesktops() )
|| desktop == NETWinInfo::OnAllDesktops ) { || desktop == NETWinInfo::OnAllDesktops ) {
message += "desktop=" + TQCString().setNum( desktop ) + "\ndesktoprule=3\n"; 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 ); NETWinInfo info( qt_xdisplay(), w, qt_xrootwin(), NET::WMState );
if ( ( desktop > 0 && desktop <= kwinmodule->numberOfDesktops() ) if ( ( desktop > 0 && desktop <= twinmodule->numberOfDesktops() )
|| desktop == NETWinInfo::OnAllDesktops ) || desktop == NETWinInfo::OnAllDesktops )
info.setDesktop( desktop ); info.setDesktop( desktop );
@ -312,13 +312,13 @@ int main( int argc, char *argv[] )
for(int i=0; i < args->count(); i++) for(int i=0; i < args->count(); i++)
proc << args->arg(i); proc << args->arg(i);
kwinmodule = new KWinModule; twinmodule = new KWinModule;
desktop = args->getOption( "desktop" ).toInt(); desktop = args->getOption( "desktop" ).toInt();
if ( args->isSet ( "alldesktops") ) if ( args->isSet ( "alldesktops") )
desktop = NETWinInfo::OnAllDesktops; desktop = NETWinInfo::OnAllDesktops;
if ( args->isSet ( "currentdesktop") ) if ( args->isSet ( "currentdesktop") )
desktop = kwinmodule->currentDesktop(); desktop = twinmodule->currentDesktop();
windowtitle = args->getOption( "window" ); windowtitle = args->getOption( "window" );
windowclass = args->getOption( "windowclass" ); windowclass = args->getOption( "windowclass" );

@ -50,8 +50,8 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kstatusbar.h> #include <kstatusbar.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <kwin.h> #include <twin.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <dnssd/remoteservice.h> #include <dnssd/remoteservice.h>

@ -59,7 +59,7 @@ class TopLevel : public KMainWindow, public KSGRD::SensorClient, public DCOPObje
void initStatusBar(); void initStatusBar();
k_dcop: k_dcop:
// calling ksysguard with kwin/kicker hot-key // calling ksysguard with twin/kicker hot-key
ASYNC showProcesses(); ASYNC showProcesses();
ASYNC showOnCurrentDesktop(); ASYNC showOnCurrentDesktop();
ASYNC loadWorkSheet( const TQString &fileName ); ASYNC loadWorkSheet( const TQString &fileName );

@ -10,7 +10,7 @@
#include <klocale.h> #include <klocale.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kprocess.h> #include <kprocess.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <kconfig.h> #include <kconfig.h>
#include <ksystemtray.h> #include <ksystemtray.h>
@ -23,10 +23,10 @@
KSysTrayCmd::KSysTrayCmd() KSysTrayCmd::KSysTrayCmd()
: TQLabel( 0, "systray_cmd" ), : TQLabel( 0, "systray_cmd" ),
isVisible(true), lazyStart( false ), noquit( false ), quitOnHide( false ), onTop(false), ownIcon(false), 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 ); tqsetAlignment( AlignCenter );
kwinmodule = new KWinModule( TQT_TQOBJECT(this) ); twinmodule = new KWinModule( TQT_TQOBJECT(this) );
refresh(); refresh();
} }
@ -114,8 +114,8 @@ void KSysTrayCmd::setTargetWindow( WId w )
void KSysTrayCmd::setTargetWindow( const KWin::WindowInfo &info ) void KSysTrayCmd::setTargetWindow( const KWin::WindowInfo &info )
{ {
disconnect( kwinmodule, TQT_SIGNAL(windowAdded(WId)), this, TQT_SLOT(windowAdded(WId)) ); disconnect( twinmodule, TQT_SIGNAL(windowAdded(WId)), this, TQT_SLOT(windowAdded(WId)) );
connect( kwinmodule, TQT_SIGNAL(windowChanged(WId)), TQT_SLOT(windowChanged(WId)) ); connect( twinmodule, TQT_SIGNAL(windowChanged(WId)), TQT_SLOT(windowChanged(WId)) );
win = info.win(); win = info.win();
KWin::setSystemTrayWindowFor( winId(), win ); KWin::setSystemTrayWindowFor( winId(), win );
refresh(); refresh();
@ -179,7 +179,7 @@ bool KSysTrayCmd::startClient()
{ {
client = new KShellProcess(); client = new KShellProcess();
*client << command; *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 *) ), connect( client, TQT_SIGNAL( processExited(KProcess *) ),
this, TQT_SLOT( clientExited() ) ); this, TQT_SLOT( clientExited() ) );
@ -265,7 +265,7 @@ void KSysTrayCmd::execContextMenu( const TQPoint &pos )
void KSysTrayCmd::checkExistingWindows() void KSysTrayCmd::checkExistingWindows()
{ {
TQValueList<WId>::ConstIterator it; 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 ); windowAdded( *it );
if ( win ) if ( win )
break; break;

@ -4,7 +4,7 @@
#define KSYSTRAYCMD_H #define KSYSTRAYCMD_H
#include <tqlabel.h> #include <tqlabel.h>
#include <kwin.h> #include <twin.h>
class KShellProcess; class KShellProcess;
class KWinModule; class KWinModule;
@ -77,7 +77,7 @@ private:
WId win; WId win;
KShellProcess *client; KShellProcess *client;
KWinModule *kwinmodule; KWinModule *twinmodule;
TQString errStr; TQString errStr;
/** Memorized 'top' position of the window*/ /** Memorized 'top' position of the window*/

@ -26,7 +26,7 @@
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <ktip.h> #include <ktip.h>
#include <kuniqueapplication.h> #include <kuniqueapplication.h>
#include <kwin.h> #include <twin.h>
#include <stdlib.h> #include <stdlib.h>
static const char description[] = I18N_NOOP("Useful tips"); static const char description[] = I18N_NOOP("Useful tips");

@ -9,11 +9,11 @@
# #
################################################# #################################################
project( kwin ) project( twin )
add_subdirectory( lib ) add_subdirectory( lib )
add_subdirectory( killer ) add_subdirectory( killer )
add_subdirectory( kcmkwin ) add_subdirectory( kcmtwin )
add_subdirectory( pics ) add_subdirectory( pics )
add_subdirectory( clients ) add_subdirectory( clients )
add_subdirectory( oldheaders ) add_subdirectory( oldheaders )
@ -40,14 +40,14 @@ install( FILES KWinInterface.h DESTINATION ${INCLUDE_INSTALL_DIR} )
##### other data ################################ ##### other data ################################
tde_install_icons( kwin ) tde_install_icons( twin )
install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/kwin ) install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/twin )
install( FILES kwin.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) install( FILES twin.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
##### kwin (tdeinit) ############################ ##### twin (tdeinit) ############################
set( target kwin ) set( target twin )
set( ${target}_SRCS set( ${target}_SRCS
workspace.cpp client.cpp placement.cpp atoms.cpp workspace.cpp client.cpp placement.cpp atoms.cpp

@ -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 compliance with the spec. Some parts also involve the pager and clients which
this document will cater for as well where applicable. this document will cater for as well where applicable.
If you modify the level of NetWM compliance (via modification of kwin/*, If you modify the level of NetWM compliance (via modification of twin/*,
tdecore/netwm.* or tdecore/kwin.* etc.), or notice any new hints that tdecore/netwm.* or tdecore/twin.* etc.), or notice any new hints that
were added after version 1.2, please modify this document appropriately. 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 Properties are ordered in the table in the order they are found in the
specification. To list any important notes regarding a property, just 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 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> -- Karol <kszwed@kde.org>
( (

@ -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 it manually for every user (for example when doing a large deployment), follow
these steps: 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 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) - Create manually all window-specific settings that should be included (see above)
- When done, check in Window-specific settings configuration module - When done, check in Window-specific settings configuration module
(Alt+F3/Configure window behavior/Window-specific settings) that all rules are (Alt+F3/Configure window behavior/Window-specific settings) that all rules are
included included
- Create a copy of $KDEHOME/share/config/kwinrulesrc and restore the original one - Create a copy of $KDEHOME/share/config/twinrulesrc and restore the original one
- Rename the copy (i.e. the newly created kwinrulesrc) to have its unique name - Rename the copy (i.e. the newly created twinrulesrc) to have its unique name
(e.g. foobar_fix_maxsize in this example case) (e.g. foobar_fix_maxsize in this example case)
- Be careful with manual modifications of the file, especially make sure the count= - Be careful with manual modifications of the file, especially make sure the count=
field in the [General] group is updated if needed 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): in this example):
# kwin_foobar_fix_maxsize.upd start # # twin_foobar_fix_maxsize.upd start #
Id=foobar_fix_maxsize Id=foobar_fix_maxsize
File=kwinrules_update File=twinrules_update
Group=Dummy Group=Dummy
Options=overwrite Options=overwrite
ScriptArguments=foobar_fix_maxsize 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/ in $KDEDIR/share/apps/kconf_update/
- The file with the window-specific settings (foobar_fix_maxsize) is to be placed - 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 All KDE user accounts should have these new window-specific settings added

@ -1,12 +1,12 @@
Mailing list and bugzilla: 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 'decorations' (decoration plugins), 'compatibility' (problems with non-KDE WMs/apps) and
'eyecandy' (transparency and similar effects). '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. to KWin's KControl modules.
@ -14,20 +14,20 @@ KWin parts:
=========== ===========
There are four parts of KWin: There are four parts of KWin:
- The KWin core, located in kdebase/kwin/*, which implements the actual functionality. - The KWin core, located in kdebase/twin/*, which implements the actual functionality.
- The decoration plugins, located in kdebase/kwin/clients and kdeartwork/kwin-styles, which - The decoration plugins, located in kdebase/twin/clients and kdeartwork/twin-styles, which
are responsible for the visual representation of the windows. 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 between the core and the decoration, and also implements some shared functionality
for the decorations. for the decorations.
- KControl modules, located in kdebase/kwin/kcmkwin. - KControl modules, located in kdebase/twin/kcmtwin.
KWin decorations: KWin decorations:
================= =================
If you want to develop a decoration plugin for KWin, a HOWTO is available at 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 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). 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 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. 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 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. 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 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 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 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, 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 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. 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. 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 - group.* - grouping related windows together (warning! This is currently really messy and scary code
that should be rewritten). that should be rewritten).
- killwindow.* - handling of the Ctrl+Esc feature - 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 - notifications.* - for KNotify
- options.* - all configuration options for KWin are stored in this class - options.* - all configuration options for KWin are stored in this class
- plugins.* - loading of the right decoration plugin - 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 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. 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. changes may have extensive consequences.
Various notes: 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. - 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 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: 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 ;) ). 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

@ -4,35 +4,35 @@ if include_kompmgr
KOMPMGR=kompmgr KOMPMGR=kompmgr
endif endif
SUBDIRS = lib . killer kcmkwin pics clients oldheaders data $(KOMPMGR) SUBDIRS = lib . killer kcmtwin pics clients oldheaders data $(KOMPMGR)
bin_PROGRAMS = bin_PROGRAMS =
lib_LTLIBRARIES = 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 \ utils.cpp layers.cpp main.cpp popupinfo.cpp tabbox.cpp \
options.cpp plugins.cpp events.cpp KWinInterface.skel \ options.cpp plugins.cpp events.cpp KWinInterface.skel \
killwindow.cpp geometrytip.cpp sm.cpp group.cpp bridge.cpp \ killwindow.cpp geometrytip.cpp sm.cpp group.cpp bridge.cpp \
manage.cpp notifications.cpp activation.cpp useractions.cpp \ manage.cpp notifications.cpp activation.cpp useractions.cpp \
geometry.cpp rules.cpp geometry.cpp rules.cpp
kwin_la_LIBADD = $(LIB_TDEUI) lib/libtdecorations.la twin_la_LIBADD = $(LIB_TDEUI) lib/libtdecorations.la
kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version twin_la_LDFLAGS = $(all_libraries) -module -avoid-version
include_HEADERS = KWinInterface.h include_HEADERS = KWinInterface.h
KDE_ICON = kwin KDE_ICON = twin
METASOURCES = AUTO METASOURCES = AUTO
messages: rc.cpp 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 include ../admin/Doxyfile.am

@ -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. - 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 do have the knowledge), the mechanisms are first briefly explained, and
then an example of fixing the various problems is given. 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. mailing list.

@ -609,7 +609,7 @@ bool Workspace::allowFullClientRaising( const Client* c, Time time )
void Workspace::restoreFocus() void Workspace::restoreFocus()
{ {
// this updateXTime() is necessary - as FocusIn events don't have // 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 // that was used by whoever caused the focus change, and therefore
// the attempt to restore the focus would fail due to old timestamp // the attempt to restore the focus would fail due to old timestamp
updateXTime(); updateXTime();
@ -663,7 +663,7 @@ void Workspace::unfakeActivity( Client* c )
/*! /*!
Updates the user time (time of last action in the active window). 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 that qualifies for user interaction (clicking on it, activate it
externally, etc.). externally, etc.).
*/ */

@ -26,7 +26,7 @@ Atoms::Atoms()
Atom atoms_return[max]; Atom atoms_return[max];
int n = 0; int n = 0;
atoms[n] = &kwin_running; atoms[n] = &twin_running;
names[n++] = (char *) "KWIN_RUNNING"; names[n++] = (char *) "KWIN_RUNNING";
atoms[n] = &wm_protocols; atoms[n] = &wm_protocols;

@ -21,7 +21,7 @@ class Atoms
public: public:
Atoms(); Atoms();
Atom kwin_running; Atom twin_running;
Atom wm_protocols; Atom wm_protocols;
Atom wm_delete_window; Atom wm_delete_window;

@ -21,7 +21,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <unistd.h> #include <unistd.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
#include <kwin.h> #include <twin.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <stdlib.h> #include <stdlib.h>
@ -1817,7 +1817,7 @@ void Client::killProcess( bool ask, Time timestamp )
else else
{ // SELI TODO handle the window created by handler specially (on top,urgent?) { // SELI TODO handle the window created by handler specially (on top,urgent?)
process_killer = new KProcess( this ); 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 << "--pid" << TQCString().setNum( pid ) << "--hostname" << machine
<< "--windowname" << caption().utf8() << "--windowname" << caption().utf8()
<< "--applicationname" << resourceClass() << "--applicationname" << resourceClass()
@ -2832,7 +2832,7 @@ kdbgstream& operator<<( kdbgstream& stream, const ConstClientList& list )
} }
#endif #endif
TQPixmap * kwin_get_menu_pix_hack() TQPixmap * twin_get_menu_pix_hack()
{ {
static TQPixmap p; static TQPixmap p;
if ( p.isNull() ) if ( p.isNull() )

@ -4,5 +4,5 @@ SUBDIRS = plastik b2 default keramik laptop modernsystem quartz redmond web
messages: rc.cpp messages: rc.cpp
$(EXTRACTRC) `find . -name \*.ui` >> 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 -rm rc.cpp

@ -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. Also, the API is documented in the .h header files.
Makefile.am: 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 . - Make sure LDFLAGS contains $(KDE_PLUGIN) and -module .
- Add -ltdecorations to LIBADD. - 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: .desktop file:
- Change kwin_ to kwin3_ in X-KDE-Library. - Change twin_ to twin3_ in X-KDE-Library.
Sources: 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 QToolTip instead of KWinToolTip.
- Use QButton instead of KWinButton, QToolButton instead of KWinToolButton and QWidget - Use QButton instead of KWinButton, QToolButton instead of KWinToolButton and QWidget
instead of KWinWidgetButton. instead of KWinWidgetButton.
@ -154,6 +154,6 @@ extern "C"
- Review mousePosition() if it's implemented. Position constants need 'Position' prepended, - Review mousePosition() if it's implemented. Position constants need 'Position' prepended,
e.g. Top -> PositionTop. e.g. Top -> PositionTop.
- Note that you cannot use "appdata" with KStandardDirs, as the decoration will be used - 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 - Implement all missing pure virtual functions. For mousePosition(), you may call
KDecoration::mousePosition() if it's sufficient. KDecoration::mousePosition() if it's sufficient.

@ -13,7 +13,7 @@ add_subdirectory( config )
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/kwin/lib ${CMAKE_SOURCE_DIR}/twin/lib
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
) )
@ -25,12 +25,12 @@ link_directories(
##### other data ################################ ##### 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 SOURCES b2client.cpp
LINK tdecorations-shared LINK tdecorations-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}

@ -3,17 +3,17 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
SUBDIRS = . config SUBDIRS = . config
kde_module_LTLIBRARIES = kwin3_b2.la kde_module_LTLIBRARIES = twin3_b2.la
kwin3_b2_la_SOURCES = b2client.cpp twin3_b2_la_SOURCES = b2client.cpp
kwin3_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module twin3_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
# kwin_b2_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) # twin_b2_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
kwin3_b2_la_LIBADD = ../../lib/libtdecorations.la twin3_b2_la_LIBADD = ../../lib/libtdecorations.la
METASOURCES = AUTO METASOURCES = AUTO
noinst_HEADERS = b2client.h noinst_HEADERS = b2client.h
lnkdir = $(kde_datadir)/kwin/ lnkdir = $(kde_datadir)/twin/
lnk_DATA = b2.desktop lnk_DATA = b2.desktop
EXTRA_DIST = $(lnk_DATA) EXTRA_DIST = $(lnk_DATA)

@ -4,4 +4,4 @@ Name[hi]=बी II
Name[lo]= B II Name[lo]= B II
Name[te]=బి II Name[te]=బి II
Name[th]=ชุดตกแต่ง B II Name[th]=ชุดตกแต่ง B II
X-KDE-Library=kwin3_b2 X-KDE-Library=twin3_b2

@ -103,7 +103,7 @@ static void read_config(B2ClientFactory *f)
buttonSize = (TQFontMetrics(options()->font(true)).height() + 1) & 0x3e; buttonSize = (TQFontMetrics(options()->font(true)).height() + 1) & 0x3e;
if (buttonSize < 16) buttonSize = 16; if (buttonSize < 16) buttonSize = 16;
KConfig conf("kwinb2rc"); KConfig conf("twinb2rc");
conf.setGroup("General"); conf.setGroup("General");
colored_frame = conf.readBoolEntry("UseTitleBarBorderColors", false); colored_frame = conf.readBoolEntry("UseTitleBarBorderColors", false);
do_draw_handle = conf.readBoolEntry("DrawGrabHandle", true); 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 menu_pix; FIXME
return PIXMAP_A(P_MENU); return PIXMAP_A(P_MENU);

@ -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 SOURCES config.cpp
LINK tdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}

@ -1,15 +1,15 @@
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = kwin_b2_config.la kde_module_LTLIBRARIES = twin_b2_config.la
kwin_b2_config_la_SOURCES = config.cpp twin_b2_config_la_SOURCES = config.cpp
kwin_b2_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module twin_b2_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin_b2_config_la_LIBADD = $(LIB_TDEUI) twin_b2_config_la_LIBADD = $(LIB_TDEUI)
METASOURCES = AUTO METASOURCES = AUTO
noinst_HEADERS = config.h noinst_HEADERS = config.h
lnkdir = $(kde_datadir)/kwin/ lnkdir = $(kde_datadir)/twin/
###KMAKE-start (don't edit or delete this block) ###KMAKE-start (don't edit or delete this block)

@ -23,18 +23,18 @@ extern "C"
/* NOTE: /* 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. * and is by default set to the "Style" group.
* *
* 'parent' is the parent of the TQObject, which is a VBox inside the * '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 ) B2Config::B2Config( KConfig* conf, TQWidget* parent )
: TQObject( parent ) : TQObject( parent )
{ {
KGlobal::locale()->insertCatalogue("kwin_b2_config"); KGlobal::locale()->insertCatalogue("twin_b2_config");
b2Config = new KConfig("kwinb2rc"); b2Config = new KConfig("twinb2rc");
gb = new TQVBox(parent); gb = new TQVBox(parent);
cbColorBorder = new TQCheckBox( cbColorBorder = new TQCheckBox(
@ -76,7 +76,7 @@ B2Config::B2Config( KConfig* conf, TQWidget* parent )
this, TQT_SLOT(slotSelectionChanged())); this, TQT_SLOT(slotSelectionChanged()));
connect(menuDblClickOp, TQT_SIGNAL(activated(int)), connect(menuDblClickOp, TQT_SIGNAL(activated(int)),
this, TQT_SLOT(slotSelectionChanged())); this, TQT_SLOT(slotSelectionChanged()));
// Make the widgets visible in kwindecoration // Make the widgets visible in twindecoration
gb->show(); gb->show();
} }
@ -94,8 +94,8 @@ void B2Config::slotSelectionChanged()
} }
// Loads the configurable options from the kwinrc config file // Loads the configurable options from the twinrc config file
// It is passed the open config from kwindecoration to improve efficiency // It is passed the open config from twindecoration to improve efficiency
void B2Config::load(KConfig * /*conf*/) void B2Config::load(KConfig * /*conf*/)
{ {
b2Config->setGroup("General"); 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*/) void B2Config::save(KConfig * /*conf*/)
{ {
b2Config->setGroup("General"); b2Config->setGroup("General");

@ -13,7 +13,7 @@ add_subdirectory( config )
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/kwin/lib ${CMAKE_SOURCE_DIR}/twin/lib
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS} ${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 SOURCES kdedefault.cpp
LINK tdecorations-shared tdecore-shared LINK tdecorations-shared tdecore-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}

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

@ -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 SOURCES config.cpp
LINK tdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}

@ -1,15 +1,15 @@
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = kwin_default_config.la kde_module_LTLIBRARIES = twin_default_config.la
kwin_default_config_la_SOURCES = config.cpp twin_default_config_la_SOURCES = config.cpp
kwin_default_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module twin_default_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin_default_config_la_LIBADD = $(LIB_TDEUI) twin_default_config_la_LIBADD = $(LIB_TDEUI)
METASOURCES = AUTO METASOURCES = AUTO
noinst_HEADERS = config.h noinst_HEADERS = config.h
lnkdir = $(kde_datadir)/kwin/ lnkdir = $(kde_datadir)/twin/
###KMAKE-start (don't edit or delete this block) ###KMAKE-start (don't edit or delete this block)

@ -24,15 +24,15 @@ extern "C"
} }
// NOTE: // 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. // and is by default set to the "Style" group.
// 'parent' is the parent of the TQObject, which is a VBox inside the // '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 ) KDEDefaultConfig::KDEDefaultConfig( KConfig* conf, TQWidget* parent )
: TQObject( parent ) : TQObject( parent )
{ {
KGlobal::locale()->insertCatalogue("kwin_clients"); KGlobal::locale()->insertCatalogue("twin_clients");
highcolor = TQPixmap::defaultDepth() > 8; highcolor = TQPixmap::defaultDepth() > 8;
gb = new TQVBox( parent ); gb = new TQVBox( parent );
gb->setSpacing( KDialog::spacingHint() ); gb->setSpacing( KDialog::spacingHint() );
@ -69,7 +69,7 @@ KDEDefaultConfig::KDEDefaultConfig( KConfig* conf, TQWidget* parent )
connect( cbUseGradients, TQT_SIGNAL(clicked()), connect( cbUseGradients, TQT_SIGNAL(clicked()),
this, TQT_SLOT(slotSelectionChanged()) ); this, TQT_SLOT(slotSelectionChanged()) );
// Make the widgets visible in kwindecoration // Make the widgets visible in twindecoration
gb->show(); gb->show();
} }
@ -86,8 +86,8 @@ void KDEDefaultConfig::slotSelectionChanged()
} }
// Loads the configurable options from the kwinrc config file // Loads the configurable options from the twinrc config file
// It is passed the open config from kwindecoration to improve efficiency // It is passed the open config from twindecoration to improve efficiency
void KDEDefaultConfig::load( KConfig* conf ) void KDEDefaultConfig::load( KConfig* conf )
{ {
conf->setGroup("KDEDefault"); 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 ) void KDEDefaultConfig::save( KConfig* conf )
{ {
conf->setGroup("KDEDefault"); conf->setGroup("KDEDefault");
@ -113,7 +113,7 @@ void KDEDefaultConfig::save( KConfig* conf )
if (highcolor) if (highcolor)
conf->writeEntry( "UseGradients", cbUseGradients->isChecked() ); 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
} }

@ -13,7 +13,7 @@ add_subdirectory( config )
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/kwin/lib ${CMAKE_SOURCE_DIR}/twin/lib
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
) )
@ -25,15 +25,15 @@ link_directories(
##### other data ################################ ##### 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 set_source_files_properties( keramik.cpp
PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tiles.h ) PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tiles.h )
tde_add_kpart( kwin3_keramik AUTOMOC tde_add_kpart( twin3_keramik AUTOMOC
SOURCES keramik.cpp SOURCES keramik.cpp
LINK tdecorations-shared tdeui-shared LINK tdecorations-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}

@ -10,18 +10,18 @@ embedtool_SOURCES = embedtool.cpp
embedtool_LDADD = $(LIB_QT) embedtool_LDADD = $(LIB_QT)
embedtool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor 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 twin3_keramik_la_SOURCES = keramik.cpp
kwin3_keramik_la_COMPILE_FIRST = tiles.h twin3_keramik_la_COMPILE_FIRST = tiles.h
kwin3_keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module twin3_keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin3_keramik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la twin3_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_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
METASOURCES = AUTO METASOURCES = AUTO
noinst_headers = keramik.h tiles.h noinst_headers = keramik.h tiles.h
lnkdir = $(kde_datadir)/kwin lnkdir = $(kde_datadir)/twin
lnk_DATA = keramik.desktop lnk_DATA = keramik.desktop
EXTRA_DIST = $(lnk_DATA) EXTRA_DIST = $(lnk_DATA)

@ -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 SOURCES config.cpp keramikconfig.ui
LINK tdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}

@ -1,13 +1,13 @@
INCLUDES = $(all_includes) 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 twin_keramik_config_la_SOURCES = config.cpp keramikconfig.ui
kwin_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module twin_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin_keramik_config_la_LIBADD = $(LIB_TDEUI) twin_keramik_config_la_LIBADD = $(LIB_TDEUI)
METASOURCES = AUTO METASOURCES = AUTO
noinst_HEADERS = config.h keramikconfig.h noinst_HEADERS = config.h keramikconfig.h
lnkdir = $(kde_datadir)/kwin lnkdir = $(kde_datadir)/twin

@ -41,18 +41,18 @@ extern "C"
/* NOTE: /* 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. * and is by default set to the "Style" group.
* *
* 'parent' is the parent of the TQObject, which is a VBox inside the * '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 ) KeramikConfig::KeramikConfig( KConfig* conf, TQWidget* parent )
: TQObject( parent ) : TQObject( parent )
{ {
KGlobal::locale()->insertCatalogue("kwin_clients"); KGlobal::locale()->insertCatalogue("twin_clients");
c = new KConfig( "kwinkeramikrc" ); c = new KConfig( "twinkeramikrc" );
ui = new KeramikConfigUI( parent ); ui = new KeramikConfigUI( parent );
connect( ui->showAppIcons, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) ); connect( ui->showAppIcons, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) );
@ -72,8 +72,8 @@ KeramikConfig::~KeramikConfig()
} }
// Loads the configurable options from the kwinrc config file // Loads the configurable options from the twinrc config file
// It is passed the open config from kwindecoration to improve efficiency // It is passed the open config from twindecoration to improve efficiency
void KeramikConfig::load( KConfig* ) void KeramikConfig::load( KConfig* )
{ {
c->setGroup("General"); 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* ) void KeramikConfig::save( KConfig* )
{ {
c->setGroup( "General" ); c->setGroup( "General" );

@ -562,7 +562,7 @@ void KeramikHandler::pretile( TQPixmap *&pix, int size, Qt::Orientation dir )
void KeramikHandler::readConfig() void KeramikHandler::readConfig()
{ {
KConfig *c = new KConfig( "kwinkeramikrc" ); KConfig *c = new KConfig( "twinkeramikrc" );
c->setGroup( "General" ); c->setGroup( "General" );
showIcons = c->readBoolEntry( "ShowAppIcons", true ); showIcons = c->readBoolEntry( "ShowAppIcons", true );

@ -27,5 +27,5 @@ Name[uk]=Керамік
Name[uz]=Keramika Name[uz]=Keramika
Name[uz@cyrillic]=Керамика Name[uz@cyrillic]=Керамика
Name[vi]=Gốm Name[vi]=Gốm
X-KDE-Library=kwin3_keramik X-KDE-Library=twin3_keramik

@ -1,15 +1,15 @@
SUBDIRS=cli_installer SUBDIRS=cli_installer
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = kwin3_kwmtheme.la kde_module_LTLIBRARIES = twin3_kwmtheme.la
kwin3_kwmtheme_la_SOURCES = kwmthemeclient.cpp twin3_kwmtheme_la_SOURCES = kwmthemeclient.cpp
kwin3_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module twin3_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin3_kwmtheme_la_LIBADD = -ltdecorations twin3_kwmtheme_la_LIBADD = -ltdecorations
METASOURCES = AUTO METASOURCES = AUTO
noinst_HEADERS = kwmthemeclient.h noinst_HEADERS = kwmthemeclient.h
lnkdir = $(kde_datadir)/kwin lnkdir = $(kde_datadir)/twin
lnk_DATA = kwmtheme.desktop lnk_DATA = kwmtheme.desktop

@ -57,10 +57,10 @@ int main(int argc, char **argv)
return(2); return(2);
} }
TQStringList appDirs = KGlobal::dirs()->findDirs("data", "kwin"); TQStringList appDirs = KGlobal::dirs()->findDirs("data", "twin");
TQString localDirStr = *(appDirs.end()); TQString localDirStr = *(appDirs.end());
if(localDirStr.isEmpty()){ if(localDirStr.isEmpty()){
localDirStr = KGlobal::dirs()->saveLocation("data", "kwin"); localDirStr = KGlobal::dirs()->saveLocation("data", "twin");
} }
localDirStr += "/pics/"; localDirStr += "/pics/";
if(!TQFile::exists(localDirStr)) if(!TQFile::exists(localDirStr))

@ -78,4 +78,4 @@ Name[xh]=Umxholo we KWM
Name[zh_CN]=KWM 主题 Name[zh_CN]=KWM 主题
Name[zh_TW]=KWM 主題 Name[zh_TW]=KWM 主題
Name[zu]=Ingqikithi ye-KWM Name[zu]=Ingqikithi ye-KWM
X-KDE-Library=kwin3_kwmtheme X-KDE-Library=twin3_kwmtheme

@ -90,7 +90,7 @@ static void create_pixmaps()
for(int i=0; i < 8; ++i) for(int i=0; i < 8; ++i)
{ {
framePixmaps[i] = new TQPixmap(locate("data", framePixmaps[i] = new TQPixmap(locate("data",
"kwin/pics/"+config->readEntry(keys[i], " "))); "twin/pics/"+config->readEntry(keys[i], " ")));
if(framePixmaps[i]->isNull()) if(framePixmaps[i]->isNull())
kdWarning() << "Unable to load frame pixmap for " << keys[i] << endl; kdWarning() << "Unable to load frame pixmap for " << keys[i] << endl;
} }
@ -111,33 +111,33 @@ static void create_pixmaps()
maxExtent++; maxExtent++;
menuPix = new TQPixmap(locate("data", menuPix = new TQPixmap(locate("data",
"kwin/pics/"+config->readEntry("menu", " "))); "twin/pics/"+config->readEntry("menu", " ")));
iconifyPix = new TQPixmap(locate("data", iconifyPix = new TQPixmap(locate("data",
"kwin/pics/"+config->readEntry("iconify", " "))); "twin/pics/"+config->readEntry("iconify", " ")));
maxPix = new TQPixmap(locate("appdata", maxPix = new TQPixmap(locate("appdata",
"pics/"+config->readEntry("maximize", " "))); "pics/"+config->readEntry("maximize", " ")));
minmaxPix = new TQPixmap(locate("data", minmaxPix = new TQPixmap(locate("data",
"kwin/pics/"+config->readEntry("maximizedown", " "))); "twin/pics/"+config->readEntry("maximizedown", " ")));
closePix = new TQPixmap(locate("data", closePix = new TQPixmap(locate("data",
"kwin/pics/"+config->readEntry("close", " "))); "twin/pics/"+config->readEntry("close", " ")));
pinupPix = new TQPixmap(locate("data", pinupPix = new TQPixmap(locate("data",
"kwin/pics/"+config->readEntry("pinup", " "))); "twin/pics/"+config->readEntry("pinup", " ")));
pindownPix = new TQPixmap(locate("data", pindownPix = new TQPixmap(locate("data",
"kwin/pics/"+config->readEntry("pindown", " "))); "twin/pics/"+config->readEntry("pindown", " ")));
if(menuPix->isNull()) if(menuPix->isNull())
menuPix->load(locate("data", "kwin/pics/menu.png")); menuPix->load(locate("data", "twin/pics/menu.png"));
if(iconifyPix->isNull()) if(iconifyPix->isNull())
iconifyPix->load(locate("data", "kwin/pics/iconify.png")); iconifyPix->load(locate("data", "twin/pics/iconify.png"));
if(maxPix->isNull()) if(maxPix->isNull())
maxPix->load(locate("data", "kwin/pics/maximize.png")); maxPix->load(locate("data", "twin/pics/maximize.png"));
if(minmaxPix->isNull()) if(minmaxPix->isNull())
minmaxPix->load(locate("data", "kwin/pics/maximizedown.png")); minmaxPix->load(locate("data", "twin/pics/maximizedown.png"));
if(closePix->isNull()) if(closePix->isNull())
closePix->load(locate("data", "kwin/pics/close.png")); closePix->load(locate("data", "twin/pics/close.png"));
if(pinupPix->isNull()) if(pinupPix->isNull())
pinupPix->load(locate("data", "kwin/pics/pinup.png")); pinupPix->load(locate("data", "twin/pics/pinup.png"));
if(pindownPix->isNull()) if(pindownPix->isNull())
pindownPix->load(locate("data", "kwin/pics/pindown.png")); pindownPix->load(locate("data", "twin/pics/pindown.png"));
tmpStr = config->readEntry("TitleAlignment"); tmpStr = config->readEntry("TitleAlignment");
if(tmpStr == "right") if(tmpStr == "right")
@ -186,14 +186,14 @@ static void create_pixmaps()
tmpStr = config->readEntry("TitlebarPixmapActive", ""); tmpStr = config->readEntry("TitlebarPixmapActive", "");
if(!tmpStr.isEmpty()){ if(!tmpStr.isEmpty()){
aTitlePix = new KPixmap; aTitlePix = new KPixmap;
aTitlePix->load(locate("data", "kwin/pics/" + tmpStr)); aTitlePix->load(locate("data", "twin/pics/" + tmpStr));
} }
else else
aTitlePix = NULL; aTitlePix = NULL;
tmpStr = config->readEntry("TitlebarPixmapInactive", ""); tmpStr = config->readEntry("TitlebarPixmapInactive", "");
if(!tmpStr.isEmpty()){ if(!tmpStr.isEmpty()){
iTitlePix = new KPixmap; iTitlePix = new KPixmap;
iTitlePix->load(locate("data", "kwin/pics/" + tmpStr)); iTitlePix->load(locate("data", "twin/pics/" + tmpStr));
} }
else else
iTitlePix = NULL; iTitlePix = NULL;

@ -11,7 +11,7 @@
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/kwin/lib ${CMAKE_SOURCE_DIR}/twin/lib
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
) )
@ -23,12 +23,12 @@ link_directories(
##### other data ################################ ##### 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 SOURCES laptopclient.cpp
LINK tdecorations-shared LINK tdecorations-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}

@ -1,16 +1,16 @@
INCLUDES = -I$(srcdir)/../../lib $(all_includes) INCLUDES = -I$(srcdir)/../../lib $(all_includes)
kde_module_LTLIBRARIES = kwin3_laptop.la kde_module_LTLIBRARIES = twin3_laptop.la
kwin3_laptop_la_SOURCES = laptopclient.cpp twin3_laptop_la_SOURCES = laptopclient.cpp
kwin3_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module twin3_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin3_laptop_la_LIBADD = ../../lib/libtdecorations.la twin3_laptop_la_LIBADD = ../../lib/libtdecorations.la
METASOURCES = AUTO METASOURCES = AUTO
noinst_HEADERS = laptopclient.h noinst_HEADERS = laptopclient.h
lnkdir = $(kde_datadir)/kwin lnkdir = $(kde_datadir)/twin
lnk_DATA = laptop.desktop lnk_DATA = laptop.desktop
EXTRA_DIST = $(lnk_DATA) EXTRA_DIST = $(lnk_DATA)

@ -66,4 +66,4 @@ Name[xh]=Umphezulu osongiweyo
Name[zh_CN]=笔记本电脑 Name[zh_CN]=笔记本电脑
Name[zh_TW]=筆記型電腦 Name[zh_TW]=筆記型電腦
Name[zu]=Ikhomputha ephathwayo eyisicaba Name[zu]=Ikhomputha ephathwayo eyisicaba
X-KDE-Library=kwin3_laptop X-KDE-Library=twin3_laptop

@ -12,7 +12,7 @@
add_subdirectory( config ) add_subdirectory( config )
include_directories( include_directories(
${CMAKE_SOURCE_DIR}/kwin/lib ${CMAKE_SOURCE_DIR}/twin/lib
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
) )
@ -24,12 +24,12 @@ link_directories(
##### other data ################################ ##### 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 SOURCES modernsys.cpp
LINK tdecorations-shared LINK tdecorations-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}

@ -3,16 +3,16 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
SUBDIRS = config SUBDIRS = config
kde_module_LTLIBRARIES = kwin3_modernsys.la kde_module_LTLIBRARIES = twin3_modernsys.la
kwin3_modernsys_la_SOURCES = modernsys.cpp twin3_modernsys_la_SOURCES = modernsys.cpp
kwin3_modernsys_la_LIBADD = ../../lib/libtdecorations.la twin3_modernsys_la_LIBADD = ../../lib/libtdecorations.la
kwin3_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module twin3_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO METASOURCES = AUTO
noinst_HEADERS = modernsys.h noinst_HEADERS = modernsys.h
lnkdir = $(kde_datadir)/kwin/ lnkdir = $(kde_datadir)/twin/
lnk_DATA = modernsystem.desktop lnk_DATA = modernsystem.desktop
EXTRA_DIST = $(lnk_DATA) EXTRA_DIST = $(lnk_DATA)

@ -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 SOURCES config.cpp
LINK tdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}

@ -1,14 +1,14 @@
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = kwin_modernsys_config.la kde_module_LTLIBRARIES = twin_modernsys_config.la
kwin_modernsys_config_la_SOURCES = config.cpp twin_modernsys_config_la_SOURCES = config.cpp
kwin_modernsys_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module twin_modernsys_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin_modernsys_config_la_LIBADD = $(LIB_TDEUI) twin_modernsys_config_la_LIBADD = $(LIB_TDEUI)
METASOURCES = AUTO METASOURCES = AUTO
noinst_HEADERS = config.h noinst_HEADERS = config.h
lnkdir = $(kde_datadir)/kwin/ lnkdir = $(kde_datadir)/twin/

@ -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. // and is by default set to the "Style" group.
// //
// 'parent' is the parent of the TQObject, which is a VBox inside the // '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) ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(parent)
{ {
clientrc = new KConfig("kwinmodernsysrc"); clientrc = new KConfig("twinmodernsysrc");
KGlobal::locale()->insertCatalogue("kwin_clients"); KGlobal::locale()->insertCatalogue("twin_clients");
mainw = new TQWidget(parent); mainw = new TQWidget(parent);
vbox = new TQVBoxLayout(mainw); vbox = new TQVBoxLayout(mainw);
vbox->setSpacing(6); vbox->setSpacing(6);

@ -217,7 +217,7 @@ void ModernSysFactory::read_config()
bool showh; bool showh;
int hsize, hwidth, bwidth, theight; int hsize, hwidth, bwidth, theight;
KConfig c("kwinmodernsysrc"); KConfig c("twinmodernsysrc");
c.setGroup("General"); c.setGroup("General");
showh = c.readBoolEntry("ShowHandle", true); showh = c.readBoolEntry("ShowHandle", true);

@ -66,4 +66,4 @@ Name[vi]=Hệ thống Hiện đại
Name[wa]=Sistinme modiene Name[wa]=Sistinme modiene
Name[zh_CN]=现代系统 Name[zh_CN]=现代系统
Name[zh_TW]=現代系統 Name[zh_TW]=現代系統
X-KDE-Library=kwin3_modernsys X-KDE-Library=twin3_modernsys

@ -15,7 +15,7 @@ add_definitions( -DQT_PLUGIN )
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/kwin/lib ${CMAKE_SOURCE_DIR}/twin/lib
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
) )
@ -27,12 +27,12 @@ link_directories(
##### other data ################################ ##### 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 SOURCES plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp
LINK tdecorations-shared tdeui-shared LINK tdecorations-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}

@ -6,14 +6,14 @@ KDE_CXXFLAGS = -DQT_PLUGIN
INCLUDES = -I$(srcdir)/../../lib $(all_includes) INCLUDES = -I$(srcdir)/../../lib $(all_includes)
kwindir = $(kde_datadir)/kwin/ twindir = $(kde_datadir)/twin/
kwin_DATA = plastik.desktop twin_DATA = plastik.desktop
kde_module_LTLIBRARIES = kwin3_plastik.la kde_module_LTLIBRARIES = twin3_plastik.la
kwin3_plastik_la_SOURCES = plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp twin3_plastik_la_SOURCES = plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp
kwin3_plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module twin3_plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin3_plastik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la twin3_plastik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
kwin3_plastik_la_METASOURCES = AUTO twin3_plastik_la_METASOURCES = AUTO
DISTCLEANFILES = $(kwin3_plastik_la_METASOURCES) DISTCLEANFILES = $(twin3_plastik_la_METASOURCES)

@ -24,9 +24,9 @@ link_directories(
install( FILES DESTINATION ${XDG_APPS_INSTALL_DIR} ) 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 SOURCES config.cpp configdialog.ui
LINK tdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}

@ -1,14 +1,14 @@
INCLUDES = $(all_includes) 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 twin_plastik_config_la_SOURCES = config.cpp configdialog.ui
kwin_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module twin_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin_plastik_config_la_LIBADD = $(LIB_TDEUI) twin_plastik_config_la_LIBADD = $(LIB_TDEUI)
METASOURCES = AUTO METASOURCES = AUTO
noinst_HEADERS = config.h noinst_HEADERS = config.h
DISTCLEANFILES = $(METASOURCES) DISTCLEANFILES = $(METASOURCES)
lnkdir = $(kde_datadir)/kwin lnkdir = $(kde_datadir)/twin

@ -38,8 +38,8 @@ PlastikConfig::PlastikConfig(KConfig* config, TQWidget* parent)
: TQObject(parent), m_config(0), m_dialog(0) : TQObject(parent), m_config(0), m_dialog(0)
{ {
// create the configuration object // create the configuration object
m_config = new KConfig("kwinplastikrc"); m_config = new KConfig("twinplastikrc");
KGlobal::locale()->insertCatalogue("kwin_clients"); KGlobal::locale()->insertCatalogue("twin_clients");
// create and show the configuration dialog // create and show the configuration dialog
m_dialog = new ConfigDialog(parent); m_dialog = new ConfigDialog(parent);

@ -162,7 +162,7 @@ bool PlastikHandler::supports( Ability ability )
void PlastikHandler::readConfig() void PlastikHandler::readConfig()
{ {
// create a config object // create a config object
KConfig config("kwinplastikrc"); KConfig config("twinplastikrc");
config.setGroup("General"); config.setGroup("General");
// grab settings // grab settings

@ -34,4 +34,4 @@ Name[uk]=Пластик
Name[uz@cyrillic]=Пластик Name[uz@cyrillic]=Пластик
Name[vi]=Chất dẻo Name[vi]=Chất dẻo
Name[zh_CN]=塑料 Name[zh_CN]=塑料
X-KDE-Library=kwin3_plastik X-KDE-Library=twin3_plastik

@ -20,7 +20,7 @@
Boston, MA 02110-1301, USA. Boston, MA 02110-1301, USA.
*/ */
// #include <kwin/options.h> // #include <twin/options.h>
#include <tqbitmap.h> #include <tqbitmap.h>
#include <tqpainter.h> #include <tqpainter.h>

@ -13,7 +13,7 @@ add_subdirectory( config )
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/kwin/lib ${CMAKE_SOURCE_DIR}/twin/lib
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
) )
@ -25,12 +25,12 @@ link_directories(
##### other data ################################ ##### 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 SOURCES quartz.cpp
LINK tdecorations-shared tdeui-shared LINK tdecorations-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}

@ -3,16 +3,16 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
SUBDIRS = . config SUBDIRS = . config
kde_module_LTLIBRARIES = kwin3_quartz.la kde_module_LTLIBRARIES = twin3_quartz.la
kwin3_quartz_la_SOURCES = quartz.cpp twin3_quartz_la_SOURCES = quartz.cpp
kwin3_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module twin3_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin3_quartz_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la twin3_quartz_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
METASOURCES = AUTO METASOURCES = AUTO
noinst_HEADERS = quartz.h noinst_HEADERS = quartz.h
lnkdir = $(kde_datadir)/kwin/ lnkdir = $(kde_datadir)/twin/
lnk_DATA = quartz.desktop lnk_DATA = quartz.desktop
EXTRA_DIST = $(lnk_DATA) EXTRA_DIST = $(lnk_DATA)

@ -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 SOURCES config.cpp
LINK tdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}

@ -1,15 +1,15 @@
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = kwin_quartz_config.la kde_module_LTLIBRARIES = twin_quartz_config.la
kwin_quartz_config_la_SOURCES = config.cpp twin_quartz_config_la_SOURCES = config.cpp
kwin_quartz_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module twin_quartz_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin_quartz_config_la_LIBADD = $(LIB_TDEUI) twin_quartz_config_la_LIBADD = $(LIB_TDEUI)
METASOURCES = AUTO METASOURCES = AUTO
noinst_HEADERS = config.h noinst_HEADERS = config.h
lnkdir = $(kde_datadir)/kwin/ lnkdir = $(kde_datadir)/twin/
###KMAKE-start (don't edit or delete this block) ###KMAKE-start (don't edit or delete this block)

@ -23,18 +23,18 @@ extern "C"
/* NOTE: /* 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. * and is by default set to the "Style" group.
* *
* 'parent' is the parent of the TQObject, which is a VBox inside the * '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 ) QuartzConfig::QuartzConfig( KConfig* conf, TQWidget* parent )
: TQObject( parent ) : TQObject( parent )
{ {
quartzConfig = new KConfig("kwinquartzrc"); quartzConfig = new KConfig("twinquartzrc");
KGlobal::locale()->insertCatalogue("kwin_clients"); KGlobal::locale()->insertCatalogue("twin_clients");
gb = new TQVBox( parent ); gb = new TQVBox( parent );
cbColorBorder = new TQCheckBox( cbColorBorder = new TQCheckBox(
i18n("Draw window frames using &titlebar colors"), gb ); 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( cbColorBorder, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()) );
connect( cbExtraSmall, 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(); gb->show();
} }
@ -70,8 +70,8 @@ void QuartzConfig::slotSelectionChanged()
} }
// Loads the configurable options from the kwinrc config file // Loads the configurable options from the twinrc config file
// It is passed the open config from kwindecoration to improve efficiency // It is passed the open config from twindecoration to improve efficiency
void QuartzConfig::load( KConfig* /*conf*/ ) void QuartzConfig::load( KConfig* /*conf*/ )
{ {
quartzConfig->setGroup("General"); 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*/ ) void QuartzConfig::save( KConfig* /*conf*/ )
{ {
quartzConfig->setGroup("General"); quartzConfig->setGroup("General");

@ -201,7 +201,7 @@ bool QuartzHandler::supports( Ability ability )
void QuartzHandler::readConfig() void QuartzHandler::readConfig()
{ {
KConfig conf("kwinquartzrc"); KConfig conf("twinquartzrc");
conf.setGroup("General"); conf.setGroup("General");
coloredFrame = conf.readBoolEntry( "UseTitleBarBorderColors", true ); coloredFrame = conf.readBoolEntry( "UseTitleBarBorderColors", true );
extraSlim = conf.readBoolEntry( "UseQuartzExtraSlim", false ); extraSlim = conf.readBoolEntry( "UseQuartzExtraSlim", false );

@ -36,4 +36,4 @@ Name[uz@cyrillic]=Чақмоқтош
Name[ven]=Musuku Name[ven]=Musuku
Name[vi]=Thạch anh Name[vi]=Thạch anh
Name[zh_TW]=石英 Name[zh_TW]=石英
X-KDE-Library=kwin3_quartz X-KDE-Library=twin3_quartz

@ -11,7 +11,7 @@
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/kwin/lib ${CMAKE_SOURCE_DIR}/twin/lib
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
) )
@ -23,12 +23,12 @@ link_directories(
##### other data ################################ ##### 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 SOURCES redmond.cpp
LINK tdecorations-shared tdecore-shared LINK tdecorations-shared tdecore-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}

@ -1,16 +1,16 @@
INCLUDES = -I$(srcdir)/../../lib $(all_includes) INCLUDES = -I$(srcdir)/../../lib $(all_includes)
kde_module_LTLIBRARIES = kwin3_redmond.la kde_module_LTLIBRARIES = twin3_redmond.la
kwin3_redmond_la_SOURCES = redmond.cpp twin3_redmond_la_SOURCES = redmond.cpp
kwin3_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module twin3_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin3_redmond_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.la twin3_redmond_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.la
METASOURCES = AUTO METASOURCES = AUTO
noinst_HEADERS = redmond.h noinst_HEADERS = redmond.h
lnkdir = $(kde_datadir)/kwin lnkdir = $(kde_datadir)/twin
lnk_DATA = redmond.desktop lnk_DATA = redmond.desktop
EXTRA_DIST = $(lnk_DATA) EXTRA_DIST = $(lnk_DATA)

@ -16,4 +16,4 @@ Name[te]=రెడ్ మండ్
Name[tg]=Райдмонд Name[tg]=Райдмонд
Name[th]=แบบเรดมอนด์ Name[th]=แบบเรดมอนด์
Name[uz@cyrillic]=Редмонд Name[uz@cyrillic]=Редмонд
X-KDE-Library=kwin3_redmond X-KDE-Library=twin3_redmond

@ -3,7 +3,7 @@
* Redmond KWin client * Redmond KWin client
* *
* Copyright 2001-2003 * 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> * Karol Szwed <gallium@kde.org>
* http://gallium.n3.net/ * http://gallium.n3.net/
* *

@ -1,15 +1,15 @@
INCLUDES = -I$(srcdir)/../../lib $(all_includes) INCLUDES = -I$(srcdir)/../../lib $(all_includes)
kde_module_LTLIBRARIES = kwin3_test.la kde_module_LTLIBRARIES = twin3_test.la
kwin3_test_la_SOURCES = test.cpp twin3_test_la_SOURCES = test.cpp
kwin3_test_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module twin3_test_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin3_test_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la twin3_test_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
#kwin_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) #twin_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
METASOURCES = AUTO METASOURCES = AUTO
kwin_test_lnkdir = $(kde_datadir)/kwin twin_test_lnkdir = $(kde_datadir)/twin
kwin_test_lnk_DATA = test.desktop twin_test_lnk_DATA = test.desktop
EXTRA_DIST = $(kwin_test_lnk_DATA) EXTRA_DIST = $(twin_test_lnk_DATA)

@ -64,4 +64,4 @@ Name[vi]=Thử KWin
Name[wa]=Saye KPurnea Name[wa]=Saye KPurnea
Name[zh_CN]=KWin 测试 Name[zh_CN]=KWin 测试
Name[zh_TW]=KWin 測試 Name[zh_TW]=KWin 測試
X-KDE-Library=kwin3_test X-KDE-Library=twin3_test

@ -22,12 +22,12 @@ link_directories(
##### other data ################################ ##### 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 SOURCES Web.cpp WebButton.cpp
LINK tdecorations-shared tdeui-shared LINK tdecorations-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}

@ -1,15 +1,15 @@
INCLUDES = -I$(top_srcdir) $(all_includes) 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 noinst_HEADERS = Web.h WebButton.h
kwin3_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module twin3_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin3_web_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la twin3_web_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
METASOURCES = AUTO METASOURCES = AUTO
linkdir = $(kde_datadir)/kwin/ linkdir = $(kde_datadir)/twin/
link_DATA = web.desktop link_DATA = web.desktop
EXTRA_DIST = $(link_DATA) EXTRA_DIST = $(link_DATA)

@ -1,5 +1,5 @@
/* /*
'Web' kwin client 'Web' twin client
Copyright (C) 2005 Sandro Giessl <sandro@giessl.com> Copyright (C) 2005 Sandro Giessl <sandro@giessl.com>
Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org> Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org>
@ -183,7 +183,7 @@ WebClient::init()
if (0 != titleHeight_ % 2) if (0 != titleHeight_ % 2)
titleHeight_ += 1; titleHeight_ += 1;
KConfig c("kwinwebrc"); KConfig c("twinwebrc");
c.setGroup("General"); c.setGroup("General");
tqshape_ = c.readBoolEntry("Shape", true); tqshape_ = c.readBoolEntry("Shape", true);

@ -1,5 +1,5 @@
/* /*
'Web' kwin client 'Web' twin client
Copyright (C) 2005 Sandro Giessl <sandro@giessl.com> Copyright (C) 2005 Sandro Giessl <sandro@giessl.com>
Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org> Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org>

@ -1,5 +1,5 @@
/* /*
'Web' kwin client 'Web' twin client
Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org> Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org>

@ -1,5 +1,5 @@
/* /*
'Web' kwin client 'Web' twin client
Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org> Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org>

@ -44,4 +44,4 @@ Name[vi]=Mạng
Name[wa]=Waibe Name[wa]=Waibe
Name[zh_TW]=網頁 Name[zh_TW]=網頁
Name[zu]=I-Web Name[zu]=I-Web
X-KDE-Library=kwin3_web X-KDE-Library=twin3_web

@ -22,13 +22,13 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES install( FILES
kwin.upd kwinsticky.upd kwiniconify.upd kwin3_plugin.upd twin.upd twinsticky.upd twiniconify.upd twin3_plugin.upd
kwin_focus1.upd kwinupdatewindowsettings.upd twin_focus1.upd twinupdatewindowsettings.upd
kwin_focus2.upd kwin_fsp_workarounds_1.upd twin_focus2.upd twin_fsp_workarounds_1.upd
DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
install( PROGRAMS 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} ) DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
install( FILES install( FILES
@ -36,22 +36,22 @@ install( FILES
DESTINATION ${SOUND_INSTALL_DIR} ) DESTINATION ${SOUND_INSTALL_DIR} )
install( FILES install( FILES
fsp_workarounds_1.kwinrules fsp_workarounds_1.twinrules
DESTINATION ${DATA_INSTALL_DIR}/kwin/default_rules ) 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 SOURCES update_window_settings.cpp
LINK tdecore-shared LINK tdecore-shared
DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin 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 SOURCES update_default_rules.cpp
LINK tdecore-shared LINK tdecore-shared
DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin

@ -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 kconfdir = $(libdir)/kconf_update_bin
kwin_update_window_settings_SOURCES = update_window_settings.cpp twin_update_window_settings_SOURCES = update_window_settings.cpp
kwin_update_window_settings_LDADD = $(LIB_TDECORE) $(KDE_RPATH) twin_update_window_settings_LDADD = $(LIB_TDECORE) $(KDE_RPATH)
kwin_update_window_settings_LDFLAGS = $(all_libraries) twin_update_window_settings_LDFLAGS = $(all_libraries)
kwin_update_default_rules_SOURCES = update_default_rules.cpp twin_update_default_rules_SOURCES = update_default_rules.cpp
kwin_update_default_rules_LDADD = $(LIB_TDECORE) $(KDE_RPATH) twin_update_default_rules_LDADD = $(LIB_TDECORE) $(KDE_RPATH)
kwin_update_default_rules_LDFLAGS = $(all_libraries) twin_update_default_rules_LDFLAGS = $(all_libraries)
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
@ -16,10 +16,10 @@ METASOURCES = AUTO
sounddir= $(kde_sounddir) sounddir= $(kde_sounddir)
sound_DATA = pop.wav sound_DATA = pop.wav
update_DATA = kwin.upd kwinsticky.upd kwiniconify.upd kwin3_plugin.upd kwin_focus1.upd \ update_DATA = twin.upd twinsticky.upd twiniconify.upd twin3_plugin.upd twin_focus1.upd \
kwinupdatewindowsettings.upd kwin_focus2.upd kwin_fsp_workarounds_1.upd twinupdatewindowsettings.upd twin_focus2.upd twin_fsp_workarounds_1.upd
update_SCRIPTS = pluginlibFix.pl kwin3_plugin.pl kwin_focus1.sh kwin_focus2.sh update_SCRIPTS = pluginlibFix.pl twin3_plugin.pl twin_focus1.sh twin_focus2.sh
updatedir = $(kde_datadir)/kconf_update updatedir = $(kde_datadir)/kconf_update
kwin_default_rules_DATA = fsp_workarounds_1.kwinrules twin_default_rules_DATA = fsp_workarounds_1.twinrules
kwin_default_rulesdir = $(kde_datadir)/kwin/default_rules twin_default_rulesdir = $(kde_datadir)/twin/default_rules

@ -1,11 +1,11 @@
Id=trinity.0r1 Id=trinity.0r1
File=kwinrc File=twinrc
Options=overwrite Options=overwrite
Script=pluginlibFix.pl,perl Script=pluginlibFix.pl,perl
# Xinerama fixups # Xinerama fixups
Id=trinity.2Xinerama Id=trinity.2Xinerama
File=kwinrc,kdeglobals File=twinrc,kdeglobals
Group=Windows Group=Windows
Key=XineramaEnabled Key=XineramaEnabled
Key=XineramaMovementEnabled Key=XineramaMovementEnabled

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

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

@ -1,5 +1,5 @@
Id=kwin_focus1 Id=twin_focus1
File=kwinrc File=twinrc
Group=Windows Group=Windows
Options=overwrite Options=overwrite
Script=kwin_focus1.sh,sh Script=twin_focus1.sh,sh

@ -1,5 +1,5 @@
Id=kwin_focus2 Id=twin_focus2
File=kwinrc File=twinrc
Group=Windows Group=Windows
Options=overwrite Options=overwrite
Script=kwin_focus2.sh,sh Script=twin_focus2.sh,sh

@ -1,8 +1,8 @@
Id=trinity51 Id=trinity51
# the file is intentionally a dummy, as the binary will update kwinrulesrc, # the file is intentionally a dummy, as the binary will update twinrulesrc,
# file kwinrules_update will just remember it has been done # file twinrules_update will just remember it has been done
File=kwinrules_update File=twinrules_update
Group=Dummy Group=Dummy
Options=overwrite Options=overwrite
ScriptArguments=fsp_workarounds_1.kwinrules ScriptArguments=fsp_workarounds_1.twinrules
Script=kwin_update_default_rules Script=twin_update_default_rules

@ -1,5 +1,5 @@
Id=iconifyupd3.1 Id=iconifyupd3.1
File=kwin.eventsrc File=twin.eventsrc
Group=iconify,minimize Group=iconify,minimize
AllKeys AllKeys
Group=deiconify,unminimize Group=deiconify,unminimize

@ -1,5 +1,5 @@
Id=stickyupd3.1 Id=stickyupd3.1
File=kwin.eventsrc File=twin.eventsrc
Group=sticky,on_all_desktops Group=sticky,on_all_desktops
AllKeys AllKeys
Group=unsticky,not_on_all_desktops Group=unsticky,not_on_all_desktops

@ -1,7 +1,7 @@
Id=trinity3b1 Id=trinity3b1
# the file is intentionally a dummy, as the binary will update kwinrc and kwinrulesrc # the file is intentionally a dummy, as the binary will update twinrc and twinrulesrc
# the kwin_update will just remember it has been done # the twin_update will just remember it has been done
File=kwin_update File=twin_update
Group=Dummy Group=Dummy
Options=overwrite Options=overwrite
Script=kwin_update_window_settings Script=twin_update_window_settings

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

@ -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. 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 <dcopclient.h>
#include <kconfig.h> #include <kconfig.h>
@ -20,15 +20,15 @@ int main( int argc, char* argv[] )
{ {
if( argc != 2 ) if( argc != 2 )
return 1; return 1;
KInstance inst( "kwin_update_default_rules" ); KInstance inst( "twin_update_default_rules" );
TQString file = locate( "data", TQString( "kwin/default_rules/" ) + argv[ 1 ] ); TQString file = locate( "data", TQString( "twin/default_rules/" ) + argv[ 1 ] );
if( file.isEmpty()) if( file.isEmpty())
{ {
kdWarning() << "File " << argv[ 1 ] << " not found!" << endl; kdWarning() << "File " << argv[ 1 ] << " not found!" << endl;
return 1; return 1;
} }
KConfig src_cfg( file ); KConfig src_cfg( file );
KConfig dest_cfg( "kwinrulesrc" ); KConfig dest_cfg( "twinrulesrc" );
src_cfg.setGroup( "General" ); src_cfg.setGroup( "General" );
dest_cfg.setGroup( "General" ); dest_cfg.setGroup( "General" );
int count = src_cfg.readNumEntry( "count", 0 ); int count = src_cfg.readNumEntry( "count", 0 );
@ -52,5 +52,5 @@ int main( int argc, char* argv[] )
dest_cfg.sync(); dest_cfg.sync();
DCOPClient client; DCOPClient client;
client.attach(); client.attach();
client.send("kwin*", "", "reconfigure()", TQString("")); client.send("twin*", "", "reconfigure()", TQString(""));
} }

@ -155,14 +155,14 @@ void writeRules( KConfig& cfg )
int main() int main()
{ {
KInstance inst( "kwin_update_window_settings" ); KInstance inst( "twin_update_window_settings" );
KConfig src_cfg( "kwinrc" ); KConfig src_cfg( "twinrc" );
KConfig dest_cfg( "kwinrulesrc" ); KConfig dest_cfg( "twinrulesrc" );
loadFakeSessionInfo( &src_cfg ); loadFakeSessionInfo( &src_cfg );
writeRules( dest_cfg ); writeRules( dest_cfg );
src_cfg.sync(); src_cfg.sync();
dest_cfg.sync(); dest_cfg.sync();
DCOPClient client; DCOPClient client;
client.attach(); client.attach();
client.send("kwin*", "", "reconfigure()", TQString("")); client.send("twin*", "", "reconfigure()", TQString(""));
} }

@ -661,7 +661,7 @@ bool Client::mapRequestEvent( XMapRequestEvent* e )
return true; // no messing with frame etc. return true; // no messing with frame etc.
} }
if( isTopMenu() && workspace()->managingTopMenus()) if( isTopMenu() && workspace()->managingTopMenus())
return true; // kwin controls these return true; // twin controls these
switch ( mappingState() ) switch ( mappingState() )
{ {
case WithdrawnState: case WithdrawnState:
@ -746,7 +746,7 @@ void Client::clientMessageEvent( XClientMessageEvent* e )
if ( e->message_type == atoms->kde_wm_change_state ) if ( e->message_type == atoms->kde_wm_change_state )
{ {
if( isTopMenu() && workspace()->managingTopMenus()) if( isTopMenu() && workspace()->managingTopMenus())
return; // kwin controls these return; // twin controls these
if( e->data.l[ 1 ] ) if( e->data.l[ 1 ] )
blockAnimation = true; blockAnimation = true;
if( e->data.l[ 0 ] == IconicState ) if( e->data.l[ 0 ] == IconicState )
@ -770,7 +770,7 @@ void Client::clientMessageEvent( XClientMessageEvent* e )
else if ( e->message_type == atoms->wm_change_state) else if ( e->message_type == atoms->wm_change_state)
{ {
if( isTopMenu() && workspace()->managingTopMenus()) if( isTopMenu() && workspace()->managingTopMenus())
return; // kwin controls these return; // twin controls these
if ( e->data.l[0] == IconicState ) if ( e->data.l[0] == IconicState )
minimize(); minimize();
return; return;
@ -825,7 +825,7 @@ void Client::configureRequestEvent( XConfigureRequestEvent* e )
sendSyntheticConfigureNotify(); sendSyntheticConfigureNotify();
// SELI TODO accept configure requests for isDesktop windows (because kdesktop // 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?
} }

@ -1,5 +1,5 @@
[!Global!] [!Global!]
IconName=kwin IconName=twin
Comment=The KDE Window Manager Comment=The KDE Window Manager
Comment[af]=Die KDE Venster Bestuurder Comment[af]=Die KDE Venster Bestuurder
Comment[ar]=مسير KDE للنوافذ Comment[ar]=مسير KDE للنوافذ

@ -22,7 +22,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <kapplication.h> #include <kapplication.h>
#include <kglobal.h> #include <kglobal.h>
#include <tqpainter.h> #include <tqpainter.h>
#include <kwin.h> #include <twin.h>
#include "placement.h" #include "placement.h"
#include "notifications.h" #include "notifications.h"
@ -316,7 +316,7 @@ TQRect Workspace::clientArea( clientAreaOption opt, const Client* c ) const
TQPoint Workspace::adjustClientPosition( Client* c, TQPoint pos ) TQPoint Workspace::adjustClientPosition( Client* c, TQPoint pos )
{ {
//CT 16mar98, 27May98 - magics: BorderSnapZone, WindowSnapZone //CT 16mar98, 27May98 - magics: BorderSnapZone, WindowSnapZone
//CT adapted for kwin on 25Nov1999 //CT adapted for twin on 25Nov1999
//aleXXX 02Nov2000 added second snapping mode //aleXXX 02Nov2000 added second snapping mode
if (options->windowSnapZone || options->borderSnapZone ) 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 // clever(?) workaround for applications like xv that want to set
// the location to the current location but miscalculate the // 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 // manager
if ( new_pos.x() == x() + clientPos().x() && new_pos.y() == y() + clientPos().y() if ( new_pos.x() == x() + clientPos().x() && new_pos.y() == y() + clientPos().y()
&& gravity == NorthWestGravity && !from_tool ) && gravity == NorthWestGravity && !from_tool )

@ -14,7 +14,7 @@ namespace KWinInternal
{ {
GeometryTip::GeometryTip( const XSizeHints* xSizeHints, bool save_under ): GeometryTip::GeometryTip( const XSizeHints* xSizeHints, bool save_under ):
TQLabel(NULL, "kwingeometry" ) TQLabel(NULL, "twingeometry" )
{ {
setMargin(1); setMargin(1);
setIndent(0); setIndent(0);

@ -777,7 +777,7 @@ Window Client::verifyTransientFor( Window new_transient_for, bool defined )
new_property_value = new_transient_for = workspace()->rootWin(); new_property_value = new_transient_for = workspace()->rootWin();
} }
// The transient_for window may be embedded in another application, // 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. // window and fix the transient_for property if possible.
WId before_search = new_transient_for; WId before_search = new_transient_for;
while( new_transient_for != None while( new_transient_for != None

@ -9,8 +9,8 @@
# #
################################################# #################################################
add_subdirectory( kwinoptions ) add_subdirectory( twinoptions )
add_subdirectory( kwindecoration ) add_subdirectory( twindecoration )
add_subdirectory( kwinrules ) add_subdirectory( twinrules )
install( FILES showdesktop.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES showdesktop.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )

@ -1,3 +1,3 @@
SUBDIRS = kwinoptions kwindecoration kwinrules SUBDIRS = twinoptions twindecoration twinrules
xdg_apps_DATA = showdesktop.desktop xdg_apps_DATA = showdesktop.desktop

@ -12,7 +12,7 @@
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/kwin/lib ${CMAKE_SOURCE_DIR}/twin/lib
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
) )
@ -23,15 +23,15 @@ link_directories(
##### other data ################################ ##### 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 SOURCES
kwindecoration.cpp buttons.cpp twindecoration.cpp buttons.cpp
kwindecorationIface.skel preview.cpp twindecorationIface.skel preview.cpp
LINK tdecorations-shared tdeui-shared Xext LINK tdecorations-shared tdeui-shared Xext
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}
) )

@ -1,18 +1,18 @@
INCLUDES = -I$(srcdir)/../../lib $(all_includes) 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 kcm_twindecoration_la_SOURCES = twindecoration.cpp buttons.cpp twindecorationIface.skel preview.cpp
noinst_HEADERS = kwindecoration.h kwindecorationIface.h buttons.h preview.h 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 -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 METASOURCES = AUTO
messages: messages:
$(XGETTEXT) *.cpp -o $(podir)/kcmkwindecoration.pot $(XGETTEXT) *.cpp -o $(podir)/kcmtwindecoration.pot
xdg_apps_DATA = kwindecoration.desktop xdg_apps_DATA = twindecoration.desktop

@ -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) 2004, Sandro Giessl <sandro@giessl.com>
Copyright (c) 2001 Copyright (c) 2001
Karol Szwed <gallium@kde.org> Karol Szwed <gallium@kde.org>
http://gallium.n3.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. 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> Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
@ -46,7 +46,7 @@
#include "pixmaps.h" #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) ButtonDrag::ButtonDrag( Button btn, TQWidget* parent, const char* name)
: TQStoredDrag( BUTTONDRAGMIMETYPE, parent, name) : TQStoredDrag( BUTTONDRAGMIMETYPE, parent, name)
{ {

@ -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) 2004, Sandro Giessl <sandro@giessl.com>
Copyright (c) 2001 Copyright (c) 2001
Karol Szwed <gallium@kde.org> Karol Szwed <gallium@kde.org>
http://gallium.n3.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. 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> Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify

@ -1,14 +1,14 @@
/* /*
This is the new kwindecoration kcontrol module This is the new twindecoration kcontrol module
Copyright (c) 2001 Copyright (c) 2001
Karol Szwed <gallium@kde.org> Karol Szwed <gallium@kde.org>
http://gallium.n3.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. 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> Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
@ -56,7 +56,7 @@
#include <kaboutdata.h> #include <kaboutdata.h>
#include <dcopclient.h> #include <dcopclient.h>
#include "kwindecoration.h" #include "twindecoration.h"
#include "preview.h" #include "preview.h"
#include <kdecoration_plugins_p.h> #include <kdecoration_plugins_p.h>
#include <kdecorationfactory.h> #include <kdecorationfactory.h>
@ -64,16 +64,16 @@
// KCModule plugin interface // KCModule plugin interface
// ========================= // =========================
typedef KGenericFactory<KWinDecorationModule, TQWidget> KWinDecoFactory; 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 &) KWinDecorationModule::KWinDecorationModule(TQWidget* parent, const char* name, const TQStringList &)
: DCOPObject("KWinClientDecoration"), : DCOPObject("KWinClientDecoration"),
KCModule(KWinDecoFactory::instance(), parent, name), KCModule(KWinDecoFactory::instance(), parent, name),
kwinConfig("kwinrc"), twinConfig("twinrc"),
pluginObject(0) pluginObject(0)
{ {
kwinConfig.setGroup("Style"); twinConfig.setGroup("Style");
plugins = new KDecorationPreviewPlugins( &kwinConfig ); plugins = new KDecorationPreviewPlugins( &twinConfig );
TQVBoxLayout* layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); 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 // Set up the decoration lists and other UI settings
findDecorations(); findDecorations();
createDecorationList(); createDecorationList();
readConfig( &kwinConfig ); readConfig( &twinConfig );
resetPlugin( &kwinConfig ); resetPlugin( &twinConfig );
tabWidget->insertTab( pluginPage, i18n("&Window Decoration") ); tabWidget->insertTab( pluginPage, i18n("&Window Decoration") );
tabWidget->insertTab( buttonPage, i18n("&Buttons") ); 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( cBorder, TQT_SIGNAL( activated( int )), TQT_SLOT( slotBorderChanged( int )));
// connect( cbUseMiniWindows, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) ); // connect( cbUseMiniWindows, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) );
// Allow kwin dcop signal to update our selection list // Allow twin dcop signal to update our selection list
connectDCOPSignal("kwin", 0, "dcopResetAllClients()", "dcopUpdateClientList()", false); connectDCOPSignal("twin", 0, "dcopResetAllClients()", "dcopUpdateClientList()", false);
KAboutData *about = KAboutData *about =
new KAboutData(I18N_NOOP("kcmkwindecoration"), new KAboutData(I18N_NOOP("kcmtwindecoration"),
I18N_NOOP("Window Decoration Control Module"), I18N_NOOP("Window Decoration Control Module"),
0, 0, KAboutData::License_GPL, 0, 0, KAboutData::License_GPL,
I18N_NOOP("(c) 2001 Karol Szwed")); 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 // And insert these into a DecorationInfo structure
void KWinDecorationModule::findDecorations() void KWinDecorationModule::findDecorations()
{ {
TQStringList dirList = KGlobal::dirs()->findDirs("data", "kwin"); TQStringList dirList = KGlobal::dirs()->findDirs("data", "twin");
TQStringList::ConstIterator it; TQStringList::ConstIterator it;
for (it = dirList.begin(); it != dirList.end(); it++) for (it = dirList.begin(); it != dirList.end(); it++)
@ -382,7 +382,7 @@ void KWinDecorationModule::findDecorations()
KDesktopFile desktopFile(filename); KDesktopFile desktopFile(filename);
TQString libName = desktopFile.readEntry("X-KDE-Library"); TQString libName = desktopFile.readEntry("X-KDE-Library");
if (!libName.isEmpty() && libName.startsWith( "kwin3_" )) if (!libName.isEmpty() && libName.startsWith( "twin3_" ))
{ {
DecorationInfo di; DecorationInfo di;
di.name = desktopFile.readName(); 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() void KWinDecorationModule::createDecorationList()
{ {
TQValueList<DecorationInfo>::ConstIterator it; 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; TQStringList decorationNames;
decorationNames.append( i18n("KDE 2") ); decorationNames.append( i18n("KDE 2") );
for (it = decorations.begin(); it != decorations.end(); ++it) 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 // Reset the decoration plugin to what the user just selected
void KWinDecorationModule::slotChangeDecoration( const TQString & text) void KWinDecorationModule::slotChangeDecoration( const TQString & text)
{ {
KConfig kwinConfig("kwinrc"); KConfig twinConfig("twinrc");
kwinConfig.setGroup("Style"); twinConfig.setGroup("Style");
// Let the user see config options for the currently selected decoration // 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()) if (libName.isEmpty())
libName = "kwin_default"; // KDE 2 libName = "twin_default"; // KDE 2
return libName; return libName;
} }
@ -525,8 +525,8 @@ TQString KWinDecorationModule::decorationLibName( const TQString& name )
// pluginConfigWidget, allowing for dynamic configuration of decorations // pluginConfigWidget, allowing for dynamic configuration of decorations
void KWinDecorationModule::resetPlugin( KConfig* conf, const TQString& currentDecoName ) void KWinDecorationModule::resetPlugin( KConfig* conf, const TQString& currentDecoName )
{ {
// Config names are "kwin_icewm_config" // Config names are "twin_icewm_config"
// for "kwin3_icewm" kwin client // for "twin3_icewm" twin client
TQString oldName = styleToConfigLib( oldLibraryName ); 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 // Updating the config plugin if required
void KWinDecorationModule::readConfig( KConfig* conf ) void KWinDecorationModule::readConfig( KConfig* conf )
{ {
@ -599,7 +599,7 @@ void KWinDecorationModule::readConfig( KConfig* conf )
oldLibraryName = currentLibraryName; oldLibraryName = currentLibraryName;
currentLibraryName = conf->readEntry("PluginLib", currentLibraryName = conf->readEntry("PluginLib",
((TQPixmap::defaultDepth() > 8) ? "kwin_plastik" : "kwin_quartz")); ((TQPixmap::defaultDepth() > 8) ? "twin_plastik" : "twin_quartz"));
TQString decoName = decorationName( currentLibraryName ); TQString decoName = decorationName( currentLibraryName );
// If we are using the "default" kde client, use the "default" entry. // 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 ) void KWinDecorationModule::writeConfig( KConfig* conf )
{ {
TQString name = decorationList->currentText(); TQString name = decorationList->currentText();
TQString libName = decorationLibName( name ); TQString libName = decorationLibName( name );
KConfig kwinConfig("kwinrc"); KConfig twinConfig("twinrc");
kwinConfig.setGroup("Style"); twinConfig.setGroup("Style");
// General settings // General settings
conf->writeEntry("PluginLib", libName); conf->writeEntry("PluginLib", libName);
@ -712,35 +712,35 @@ void KWinDecorationModule::dcopUpdateClientList()
{ {
// Changes the current active ListBox item, and // Changes the current active ListBox item, and
// Loads a new plugin configuration tab if required. // Loads a new plugin configuration tab if required.
KConfig kwinConfig("kwinrc"); KConfig twinConfig("twinrc");
kwinConfig.setGroup("Style"); twinConfig.setGroup("Style");
readConfig( &kwinConfig ); readConfig( &twinConfig );
resetPlugin( &kwinConfig ); resetPlugin( &twinConfig );
} }
// Virutal functions required by KCModule // Virutal functions required by KCModule
void KWinDecorationModule::load() void KWinDecorationModule::load()
{ {
KConfig kwinConfig("kwinrc"); KConfig twinConfig("twinrc");
kwinConfig.setGroup("Style"); twinConfig.setGroup("Style");
// Reset by re-reading the config // Reset by re-reading the config
readConfig( &kwinConfig ); readConfig( &twinConfig );
resetPlugin( &kwinConfig ); resetPlugin( &twinConfig );
} }
void KWinDecorationModule::save() void KWinDecorationModule::save()
{ {
KConfig kwinConfig("kwinrc"); KConfig twinConfig("twinrc");
kwinConfig.setGroup("Style"); twinConfig.setGroup("Style");
writeConfig( &kwinConfig ); writeConfig( &twinConfig );
emit pluginSave( &kwinConfig ); emit pluginSave( &twinConfig );
kwinConfig.sync(); twinConfig.sync();
resetKWin(); resetKWin();
// resetPlugin() will get called via the above DCOP function // resetPlugin() will get called via the above DCOP function
} }
@ -807,8 +807,8 @@ void KWinDecorationModule::checkSupportedBorderSizes()
TQString KWinDecorationModule::styleToConfigLib( TQString& styleLib ) TQString KWinDecorationModule::styleToConfigLib( TQString& styleLib )
{ {
if( styleLib.startsWith( "kwin3_" )) if( styleLib.startsWith( "twin3_" ))
return "kwin_" + styleLib.mid( 6 ) + "_config"; return "twin_" + styleLib.mid( 6 ) + "_config";
else else
return styleLib + "_config"; return styleLib + "_config";
} }
@ -828,13 +828,13 @@ TQString KWinDecorationModule::quickHelp() const
void KWinDecorationModule::resetKWin() void KWinDecorationModule::resetKWin()
{ {
bool ok = kapp->dcopClient()->send("kwin*", "KWinInterface", bool ok = kapp->dcopClient()->send("twin*", "KWinInterface",
"reconfigure()", TQByteArray()); "reconfigure()", TQByteArray());
if (!ok) 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 // vim: ts=4
// kate: space-indent off; tab-width 4; // kate: space-indent off; tab-width 4;

@ -1,12 +1,12 @@
[Desktop Entry] [Desktop Entry]
Exec=kcmshell kwindecoration Exec=kcmshell twindecoration
Icon=kcmkwm Icon=kcmkwm
Type=Application Type=Application
DocPath=kcontrol/kwindecoration/index.html DocPath=kcontrol/twindecoration/index.html
X-KDE-ModuleType=Library X-KDE-ModuleType=Library
X-KDE-Library=kwindecoration X-KDE-Library=twindecoration
X-KDE-FactoryName=kwindecoration X-KDE-FactoryName=twindecoration
Name=Window Decorations Name=Window Decorations
Name[af]=Venster Versierings Name[af]=Venster Versierings
@ -162,70 +162,70 @@ Comment[zh_CN]=配置窗口标题的观感
Comment[zh_TW]=設定視窗標題列的外觀與感覺 Comment[zh_TW]=設定視窗標題列的外觀與感覺
Comment[zu]=Hlanganisela ukubona kanye nokuzwa kwezihloko zama-window 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=twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration
Keywords[ar]=kwin,نافذة,مسيير,الحافة,الشكل,سمة,مظهر,ملمس,تصميم,زر,معامل,مدبر,kwm,زخرفات Keywords[ar]=twin,نافذة,مسيير,الحافة,الشكل,سمة,مظهر,ملمس,تصميم,زر,معامل,مدبر,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[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]=Акно,Кіраўнік,Мяжа,Стыль,Тэма,Вонкавы выгляд,Кнопкі,Апрацоўшчык,Край,Дэкарацыя,kwin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration Keywords[be]=Акно,Кіраўнік,Мяжа,Стыль,Тэма,Вонкавы выгляд,Кнопкі,Апрацоўшчык,Край,Дэкарацыя,twin,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[bg]=прозорец, декорация, заглавие, бутони, меню, twin, 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[ca]=twin,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[cs]=twin,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[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]=kwin,ffenestr,trefnydd,ymyl,arddull,thema,golwg,teimlad,haenlun,botwm,carn,kwm,addurniad Keywords[cy]=twin,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[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[de]=KWin,Kwm,Fenster,Manager,Rahmen,Design,Stile,Themes,Optik,Erscheinungsbild,Layout,Knöpfe,Ränder,Dekorationen
Keywords[el]=kwin,παράθυρο,διαχειριστής,περίγραμμα,στυλ,θέμα,εμφάνιση,αίσθηση,διάταξη,κουμπί,χειρισμός,άκρο,kwm,διακόσμηση Keywords[el]=twin,παράθυρο,διαχειριστής,περίγραμμα,στυλ,θέμα,εμφάνιση,αίσθηση,διάταξη,κουμπί,χειρισμός,άκρο,kwm,διακόσμηση
Keywords[eo]=kwin,fenestro,administrilo,rando,stilo,etoso,aspekto,konduto,aranĝo,butono,eĝo,kwm,ornamo Keywords[eo]=twin,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[es]=twin,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[et]=twin,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[eu]=twin,leihoa,kudeatzailea,ertza,estiloa,gaia,itxura,antolaketa,botoia, maneiatzailea,ertzea,kwm,dekorazioa
Keywords[fa]=kwin، پنجره، مدیر، لبه، سبک، چهره، ظاهر، احساس، طرح‌بندی، دکمه، گرداندن، لبه، kwm، تزئین Keywords[fa]=twin، پنجره، مدیر، لبه، سبک، چهره، ظاهر، احساس، طرح‌بندی، دکمه، گرداندن، لبه، kwm، تزئین
Keywords[fi]=kwin,ikkuna,ikkunaohjelma,ikkunoinnin hallintaohjelma,tausta,tyyli,teema,ulkonäkö,tuntuma,ulkoasu,painike,kahva,kulma,kwm,kehys Keywords[fi]=twin,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[fr]=twin,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[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]=kwin,fuinneog,bainisteoir,imlíne,stíl,téama,leagan amach,cnaipe,hanla,ciumhais,kwm,maisiúchán Keywords[ga]=twin,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[gl]=twin,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[he]=מנהל חלונות,חלונות,מנהל,גבול,מסגרת,סגנון,ערכה,ערכת נושא,מראה,תחושה,פריסה,תצוגה,כפתור,ידית,קצה,קישוט, twin,window,manager,border,style,theme,look,feel,layout,button,handle, edge,kwm,decoration
Keywords[hi]=के-विन,विंडो,प्रबंधक,बार्डर,शैली,प्रसंग,रूप,अनुभव,ले-आउट,बटन,हैंडल,किनारा,केडबल्यूएम,सजावट 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[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[is]=twin,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[it]=twin,finestra,window manager,bordo,stile,tema,aspetto,pulsante,maniglia,bordo,kwm,decorazione
Keywords[ja]=kwin,ウィンドウ,マネージャ,枠,スタイル,テーマ,ルック,外観,レイアウト,ボタン,ハンドル,エッジ,kwm,装飾 Keywords[ja]=twin,ウィンドウ,マネージャ,枠,スタイル,テーマ,ルック,外観,レイアウト,ボタン,ハンドル,エッジ,kwm,装飾
Keywords[km]=kwin,បង្អួច,កម្មវិធី​គ្រប់គ្រង,ស៊ុម,រចនាប័ទ្ម,ស្បែក,មុខងារ,ប្លង់,ប៊ូតុង,ការ​ប្រើ,គែម,kwm,ការ​តុបតែង Keywords[km]=twin,បង្អួច,កម្មវិធី​គ្រប់គ្រង,ស៊ុម,រចនាប័ទ្ម,ស្បែក,មុខងារ,ប្លង់,ប៊ូតុង,ការ​ប្រើ,គែម,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[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]=kwin, logs, menedžeris, rāmis, stils, tēma, skats, gars, izkārtojums, poga, rokturis, stūris, kwm, dekorācija Keywords[lv]=twin, 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[mk]=twin,window,manager,border,style,theme,look,feel,layout,button,handle,edge,kwm,decoration,прозорец,менаџер,граница,стил,тема,изглед,чувство,распоред,копче,рачка,раб,декорација
Keywords[mn]=KWin,Kwm,Цонх,Manager,Хүрээ,Design,Хэлбэр,Загвар, Optik,Харагдалт,Layout,Товч,Өнцөг,Засал 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[mt]=twin, 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[nb]=twin,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[nds]=twin,Finster,Finsterpleger,manager,Rahmen,Stil,Muster,look,feel,layout,Knoop,Greep,Rand,kwm,Dekoratschoon
Keywords[ne]=के विन,सञ्झ्याल, प्रबन्धक, किनारा, शैली, विषयवस्तु, हेराइ, बुझाइ, सजावट, बटन, ह्यान्डल, छेउ,kwm, सजावट 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[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]=kwin,vindauge,kant,bord,stil,tema,utsjånad,bunad,knapp,handtak,kwm,dekorasjon Keywords[nn]=twin,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[nso]=twin,window,molaodi,mollwane,mokgwa,molaetsa,tebelego,maikutlo,peakanyo,setobetswa,moswaro,nthla,kwm,kgabiso
Keywords[pa]=kwin,handle,edge,kwm,decoration,ਝਰੋਖਾ,ਮੈਨੇਜਰ,ਹਾਸ਼ੀਆ,ਸ਼ੈਲੀ,ਸਰੂਪ,ਦਿੱਖ,ਖਾਕਾ,ਬਟਨ,ਹੈਂਡਲ,ਸਜਾਵਟ Keywords[pa]=twin,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[pl]=twin,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]=twin,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[pt_BR]=twin,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[ro]=twin,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[rw]=twin,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[se]=twin,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[sk]=twin,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[sl]=twin,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]=twin,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[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]=kwin,fönster,hanterare,kant,stil,tema,utseende,känsla,layout,knapp,hantera,kant,kwm,dekoration Keywords[sv]=twin,fönster,hanterare,kant,stil,tema,utseende,känsla,layout,knapp,hantera,kant,kwm,dekoration
Keywords[ta]=kwin,சாளரம்,மேலாளர்,விளிம்பு,பாணி,தலைப்பு,பார்வை,உணர்தல்,உருவரை,விசை,கையாள்,முனை,kwm,அலங்கரிப்பு Keywords[ta]=twin,சாளரம்,மேலாளர்,விளிம்பு,பாணி,தலைப்பு,பார்வை,உணர்தல்,உருவரை,விசை,கையாள்,முனை,kwm,அலங்கரிப்பு
Keywords[th]=kwin,หน้าต่าง,ตัวจัดการ,กรอบ,ลักษณะ,ชุดตกแต่ง,มองเห็น,รู้สึก,การจัดวาง,ปุ่ม,ที่จับ,ขอบ,kwm,การตกแต่ง Keywords[th]=twin,หน้าต่าง,ตัวจัดการ,กรอบ,ลักษณะ,ชุดตกแต่ง,มองเห็น,รู้สึก,การจัดวาง,ปุ่ม,ที่จับ,ขอบ,kwm,การตกแต่ง
Keywords[tr]=kwin,pencere,yönetici,kenar,stil,tema,görünüş,doku,yerleşim,düğme,tutamaç,kenar,kwm,dekorasyon Keywords[tr]=twin,pencere,yönetici,kenar,stil,tema,görünüş,doku,yerleşim,düğme,tutamaç,kenar,kwm,dekorasyon
Keywords[uk]=kwin,вікно,менеджер,границя,стиль,тема,вигляд,поведінка,розклад,кнопка,handle,край,kwm,обрамлення Keywords[uk]=twin,вікно,менеджер,границя,стиль,тема,вигляд,поведінка,розклад,кнопка,handle,край,kwm,обрамлення
Keywords[uz]=kwin,kwm,bezak,oyna,boshqaruvchi,usul,tashqi koʻrinish Keywords[uz]=twin,kwm,bezak,oyna,boshqaruvchi,usul,tashqi koʻrinish
Keywords[uz@cyrillic]=kwin,kwm,безак,ойна,бошқарувчи,усул,ташқи кўриниш Keywords[uz@cyrillic]=twin,kwm,безак,ойна,бошқарувчи,усул,ташқи кўриниш
Keywords[ven]=kwin,windo,mulanguli,mukanoni,tshitaela,thero,sedza,upfa,vhuvha,bathene,fara,mafhedziselo,kwn,u khavhisedza Keywords[ven]=twin,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[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]=kwin,kpurnea,purnea,manaedjeu,boird,stîle,tinme,rivnance,layout;loukance,boton,apougnî,costé,kwm,gåliotaedje Keywords[wa]=twin,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[xh]=twin,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_CN]=twin,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[zh_TW]=twin,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[zu]=twin,i-window,imenenja,umngcele,isitayela,bona,izwa, isendlalelo,inkinobho,isibambo,unqenqema,kwm,umhlobiso
Categories=Qt;KDE;X-KDE-settings-looknfeel; Categories=Qt;KDE;X-KDE-settings-looknfeel;

@ -1,14 +1,14 @@
/* /*
This is the new kwindecoration kcontrol module This is the new twindecoration kcontrol module
Copyright (c) 2001 Copyright (c) 2001
Karol Szwed <gallium@kde.org> Karol Szwed <gallium@kde.org>
http://gallium.n3.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. 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> Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
@ -38,7 +38,7 @@
#include <kdecoration.h> #include <kdecoration.h>
#include "kwindecorationIface.h" #include "twindecorationIface.h"
class KComboBox; class KComboBox;
class TQCheckBox; class TQCheckBox;
@ -109,7 +109,7 @@ class KWinDecorationModule : public KCModule, virtual public KWinDecorationIface
KDecorationPreview* preview; KDecorationPreview* preview;
KDecorationPlugins* plugins; KDecorationPlugins* plugins;
KConfig kwinConfig; KConfig twinConfig;
TQCheckBox* cbUseCustomButtonPositions; TQCheckBox* cbUseCustomButtonPositions;
// TQCheckBox* cbUseMiniWindows; // TQCheckBox* cbUseMiniWindows;

@ -1,14 +1,14 @@
/* /*
This is the new kwindecoration kcontrol module This is the new twindecoration kcontrol module
Copyright (c) 2001 Copyright (c) 2001
Karol Szwed (gallium) <karlmail@usa.net> Karol Szwed (gallium) <karlmail@usa.net>
http://gallium.n3.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. 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> Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify

@ -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) 2004, Sandro Giessl <sandro@giessl.com>
Copyright (c) 2001 Copyright (c) 2001
Karol Szwed <gallium@kde.org> Karol Szwed <gallium@kde.org>
http://gallium.n3.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. 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> Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify

@ -454,7 +454,7 @@ KDecorationPreviewOptions::~KDecorationPreviewOptions()
unsigned long KDecorationPreviewOptions::updateSettings() unsigned long KDecorationPreviewOptions::updateSettings()
{ {
KConfig cfg( "kwinrc", true ); KConfig cfg( "twinrc", true );
unsigned long changed = 0; unsigned long changed = 0;
changed |= d->updateKWinSettings( &cfg ); changed |= d->updateKWinSettings( &cfg );

@ -23,17 +23,17 @@ link_directories(
##### other data ################################ ##### other data ################################
install( FILES kwinoptions.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES twinoptions.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( FILES install( FILES
kwinactions.desktop kwinadvanced.desktop kwinfocus.desktop twinactions.desktop twinadvanced.desktop twinfocus.desktop
kwinmoving.desktop kwintranslucency.desktop twinmoving.desktop twintranslucency.desktop
DESTINATION ${APPS_INSTALL_DIR}/.hidden ) 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 SOURCES windows.cpp mouse.cpp main.cpp
LINK tdeui-shared LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR} DESTINATION ${PLUGIN_INSTALL_DIR}

@ -1,18 +1,18 @@
METASOURCES = AUTO METASOURCES = AUTO
INCLUDES = $(all_includes) 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_twinoptions_la_SOURCES = windows.cpp mouse.cpp main.cpp
kcm_kwinoptions_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined kcm_twinoptions_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
kcm_kwinoptions_la_LIBADD = $(LIB_TDEUI) kcm_twinoptions_la_LIBADD = $(LIB_TDEUI)
noinst_HEADERS = windows.h mouse.h noinst_HEADERS = windows.h mouse.h
messages: messages:
$(XGETTEXT) *.cpp -o $(podir)/kcmkwm.pot $(XGETTEXT) *.cpp -o $(podir)/kcmkwm.pot
kwin_kcmkwin_options_data_DATA = kwinactions.desktop kwinadvanced.desktop kwinfocus.desktop kwinmoving.desktop kwintranslucency.desktop twin_kcmtwin_options_data_DATA = twinactions.desktop twinadvanced.desktop twinfocus.desktop twinmoving.desktop twintranslucency.desktop
kwin_kcmkwin_options_datadir = $(kde_appsdir)/.hidden twin_kcmtwin_options_datadir = $(kde_appsdir)/.hidden
xdg_apps_DATA = kwinoptions.desktop xdg_apps_DATA = twinoptions.desktop

@ -1,12 +1,12 @@
[Desktop Entry] [Desktop Entry]
Icon=kcmkwm Icon=kcmkwm
Type=Application Type=Application
Exec=kcmshell kwinactions Exec=kcmshell twinactions
DocPath=kcontrol/windowmanagement/index.html#action-actions DocPath=kcontrol/windowmanagement/index.html#action-actions
X-KDE-ModuleType=Library X-KDE-ModuleType=Library
X-KDE-Library=kwinoptions X-KDE-Library=twinoptions
X-KDE-FactoryName=kwinactions X-KDE-FactoryName=twinactions
Name=Actions Name=Actions
Name[af]=Aksies Name[af]=Aksies

@ -1,12 +1,12 @@
[Desktop Entry] [Desktop Entry]
Icon=kcmkwm Icon=kcmkwm
Type=Application Type=Application
Exec=kcmshell kwinadvanced Exec=kcmshell twinadvanced
DocPath=kcontrol/windowmanagement/index.html#action-advanced DocPath=kcontrol/windowmanagement/index.html#action-advanced
X-KDE-ModuleType=Library X-KDE-ModuleType=Library
X-KDE-Library=kwinoptions X-KDE-Library=twinoptions
X-KDE-FactoryName=kwinadvanced X-KDE-FactoryName=twinadvanced
Name=Advanced Name=Advanced
Name[af]=Gevorderde Name[af]=Gevorderde

@ -1,12 +1,12 @@
[Desktop Entry] [Desktop Entry]
Icon=kcmkwm Icon=kcmkwm
Type=Application Type=Application
Exec=kcmshell kwinfocus Exec=kcmshell twinfocus
DocPath=kcontrol/windowmanagement/index.html#action-focus DocPath=kcontrol/windowmanagement/index.html#action-focus
X-KDE-ModuleType=Library X-KDE-ModuleType=Library
X-KDE-Library=kwinoptions X-KDE-Library=twinoptions
X-KDE-FactoryName=kwinfocus X-KDE-FactoryName=twinfocus
Name=Focus Name=Focus
Name[af]=Fokus Name[af]=Fokus

@ -1,12 +1,12 @@
[Desktop Entry] [Desktop Entry]
Icon=kcmkwm Icon=kcmkwm
Type=Application Type=Application
Exec=kcmshell kwinmoving Exec=kcmshell twinmoving
DocPath=kcontrol/windowmanagement/index.html#action-moving DocPath=kcontrol/windowmanagement/index.html#action-moving
X-KDE-ModuleType=Library X-KDE-ModuleType=Library
X-KDE-Library=kwinoptions X-KDE-Library=twinoptions
X-KDE-FactoryName=kwinmoving X-KDE-FactoryName=twinmoving
Name=Moving Name=Moving
Name[af]=Beweeg Name[af]=Beweeg

@ -1,12 +1,12 @@
[Desktop Entry] [Desktop Entry]
Icon=kcmkwm Icon=kcmkwm
Type=Application Type=Application
Exec=kcmshell kwinoptions Exec=kcmshell twinoptions
DocPath=kcontrol/windowmanagement/index.html DocPath=kcontrol/windowmanagement/index.html
X-KDE-ModuleType=Library X-KDE-ModuleType=Library
X-KDE-Library=kwinoptions X-KDE-Library=twinoptions
X-KDE-FactoryName=kwinoptions X-KDE-FactoryName=twinoptions
Name=Window Behavior Name=Window Behavior
Name[af]=Venster Gedrag Name[af]=Venster Gedrag

@ -1,12 +1,12 @@
[Desktop Entry] [Desktop Entry]
Icon=kcmkwm Icon=kcmkwm
Type=Application Type=Application
Exec=kcmshell kwintranslucency Exec=kcmshell twintranslucency
DocPath=kcontrol/windowmanagement/index.html#action-translucency DocPath=kcontrol/windowmanagement/index.html#action-translucency
X-KDE-ModuleType=Library X-KDE-ModuleType=Library
X-KDE-Library=kwinoptions X-KDE-Library=twinoptions
X-KDE-FactoryName=kwintranslucency X-KDE-FactoryName=twintranslucency
Name=Translucency Name=Translucency
Name[af]=Deursigtigheid Name[af]=Deursigtigheid

@ -36,48 +36,48 @@
extern "C" 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"); 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); 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"); KGlobal::locale()->insertCatalogue("kcmkwm");
return new KActionsOptions( parent, name); 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"); 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); 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"); 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); 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"); 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); 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"); KGlobal::locale()->insertCatalogue("kcmkwm");
return new KWinOptions( parent, name); return new KWinOptions( parent, name);
} }
@ -86,7 +86,7 @@ extern "C"
KWinOptions::KWinOptions(TQWidget *parent, const char *name) KWinOptions::KWinOptions(TQWidget *parent, const char *name)
: KCModule(parent, name) : KCModule(parent, name)
{ {
mConfig = new KConfig("kwinrc", false, true); mConfig = new KConfig("twinrc", false, true);
TQVBoxLayout *layout = new TQVBoxLayout(this); TQVBoxLayout *layout = new TQVBoxLayout(this);
tab = new TQTabWidget(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))); connect(mTranslucency, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));
KAboutData *about = 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, 0, 0, KAboutData::License_GPL,
I18N_NOOP("(c) 1997 - 2002 KWin and KControl Authors")); I18N_NOOP("(c) 1997 - 2002 KWin and KControl Authors"));
@ -167,11 +167,11 @@ void KWinOptions::save()
mTranslucency->save(); mTranslucency->save();
emit KCModule::changed( false ); emit KCModule::changed( false );
// Send signal to kwin // Send signal to twin
mConfig->sync(); mConfig->sync();
if ( !kapp->dcopClient()->isAttached() ) if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach(); 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) KActionsOptions::KActionsOptions(TQWidget *parent, const char *name)
: KCModule(parent, name) : KCModule(parent, name)
{ {
mConfig = new KConfig("kwinrc", false, true); mConfig = new KConfig("twinrc", false, true);
TQVBoxLayout *layout = new TQVBoxLayout(this); TQVBoxLayout *layout = new TQVBoxLayout(this);
tab = new TQTabWidget(this); tab = new TQTabWidget(this);
@ -240,11 +240,11 @@ void KActionsOptions::save()
mWindowActions->save(); mWindowActions->save();
emit KCModule::changed( false ); emit KCModule::changed( false );
// Send signal to kwin // Send signal to twin
mConfig->sync(); mConfig->sync();
if ( !kapp->dcopClient()->isAttached() ) if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach(); kapp->dcopClient()->attach();
kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
} }

@ -565,7 +565,7 @@ void KTitleBarActionsConfig::save()
config->sync(); config->sync();
if ( !kapp->dcopClient()->isAttached() ) if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach(); kapp->dcopClient()->attach();
kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
} }
} }
@ -839,7 +839,7 @@ void KWindowActionsConfig::save()
config->sync(); config->sync();
if ( !kapp->dcopClient()->isAttached() ) if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach(); kapp->dcopClient()->attach();
kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
} }
} }

@ -53,7 +53,7 @@
#include "windows.h" #include "windows.h"
// kwin config keywords // twin config keywords
#define KWIN_FOCUS "FocusPolicy" #define KWIN_FOCUS "FocusPolicy"
#define KWIN_PLACEMENT "Placement" #define KWIN_PLACEMENT "Placement"
#define KWIN_MOVE "MoveMode" #define KWIN_MOVE "MoveMode"
@ -535,7 +535,7 @@ void KFocusConfig::save( void )
config->sync(); config->sync();
if ( !kapp->dcopClient()->isAttached() ) if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach(); kapp->dcopClient()->attach();
kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
} }
emit KCModule::changed(false); emit KCModule::changed(false);
} }
@ -762,7 +762,7 @@ void KAdvancedConfig::save( void )
config->sync(); config->sync();
if ( !kapp->dcopClient()->isAttached() ) if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach(); kapp->dcopClient()->attach();
kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
} }
emit KCModule::changed(false); 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("Random"), RANDOM_PLACEMENT);
placementCombo->insertItem(i18n("Centered"), CENTERED_PLACEMENT); placementCombo->insertItem(i18n("Centered"), CENTERED_PLACEMENT);
placementCombo->insertItem(i18n("Zero-Cornered"), ZEROCORNERED_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("Interactive"), INTERACTIVE_PLACEMENT);
//placementCombo->insertItem(i18n("Manual"), MANUAL_PLACEMENT); //placementCombo->insertItem(i18n("Manual"), MANUAL_PLACEMENT);
placementCombo->setCurrentItem(SMART_PLACEMENT); placementCombo->setCurrentItem(SMART_PLACEMENT);
@ -1098,7 +1098,7 @@ void KMovingConfig::load( void )
setMinimizeAnim( anim ); setMinimizeAnim( anim );
setMinimizeAnimSpeed( animSpeed ); 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"); key = config->readEntry(KWIN_RESIZE_OPAQUE, "Opaque");
if( key == "Opaque") if( key == "Opaque")
setResizeOpaque(RESIZE_OPAQUE); setResizeOpaque(RESIZE_OPAQUE);
@ -1219,7 +1219,7 @@ void KMovingConfig::save( void )
config->sync(); config->sync();
if ( !kapp->dcopClient()->isAttached() ) if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach(); kapp->dcopClient()->attach();
kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
} }
emit KCModule::changed(false); emit KCModule::changed(false);
} }
@ -1232,7 +1232,7 @@ void KMovingConfig::defaults()
setPlacement(SMART_PLACEMENT); setPlacement(SMART_PLACEMENT);
setMoveResizeMaximized(false); setMoveResizeMaximized(false);
//copied from kcontrol/konq/kwindesktop, aleXXX //copied from kcontrol/konq/twindesktop, aleXXX
setWindowSnapZone(KWM_WNDW_SNAP_ZONE_DEFAULT); setWindowSnapZone(KWM_WNDW_SNAP_ZONE_DEFAULT);
setBorderSnapZone(KWM_BRDR_SNAP_ZONE_DEFAULT); setBorderSnapZone(KWM_BRDR_SNAP_ZONE_DEFAULT);
OverlapSnap->setChecked(false); 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>" KActiveLabel *label = new KActiveLabel(i18n("<qt><b>It seems that alpha channel support is not available.</b><br><br>"
"Please make sure you have " "Please make sure you have "
"<a href=\"http://www.freedesktop.org/\">Xorg &ge; 6.8</a>," "<a href=\"http://www.freedesktop.org/\">Xorg &ge; 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>" "Also, make sure you have the following entries in your XConfig (e.g. /etc/X11/xorg.conf):<br><br>"
"<i>Section \"Extensions\"<br>" "<i>Section \"Extensions\"<br>"
"Option \"Composite\" \"Enable\"<br>" "Option \"Composite\" \"Enable\"<br>"
@ -1636,7 +1636,7 @@ void KTranslucencyConfig::save( void )
config->sync(); config->sync();
if ( !kapp->dcopClient()->isAttached() ) if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach(); kapp->dcopClient()->attach();
kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
} }
if (useTranslucency->isChecked()) if (useTranslucency->isChecked())
startKompmgr(); startKompmgr();

@ -200,7 +200,7 @@ public:
private slots: private slots:
void shadeHoverChanged(bool); void shadeHoverChanged(bool);
//copied from kcontrol/konq/kwindesktop, aleXXX //copied from kcontrol/konq/twindesktop, aleXXX
void setEBorders(); void setEBorders();
void changed() { emit KCModule::changed(true); } void changed() { emit KCModule::changed(true); }

@ -13,7 +13,7 @@ add_definitions( -DKCMRULES )
include_directories( include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/kwin/lib ${CMAKE_SOURCE_DIR}/twin/lib
${TDE_INCLUDE_DIR} ${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS}
) )
@ -24,30 +24,30 @@ link_directories(
##### other data ################################ ##### 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 SOURCES kcm.cpp
LINK kwinrules-static LINK twinrules-static
DESTINATION ${PLUGIN_INSTALL_DIR} ) 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 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 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 ruleswidgetbase.ui ruleslistbase.ui detectwidgetbase.ui
editshortcutbase.ui ) editshortcutbase.ui )

@ -1,29 +1,29 @@
METASOURCES = AUTO METASOURCES = AUTO
AM_CPPFLAGS = $(all_includes) -DKCMRULES AM_CPPFLAGS = $(all_includes) -DKCMRULES
INCLUDES = -I$(top_srcdir)/kwin/lib INCLUDES = -I$(top_srcdir)/twin/lib
bin_PROGRAMS = bin_PROGRAMS =
lib_LTLIBRARIES = lib_LTLIBRARIES =
tdeinit_LTLIBRARIES = kwin_rules_dialog.la tdeinit_LTLIBRARIES = twin_rules_dialog.la
kde_module_LTLIBRARIES = kcm_kwinrules.la kde_module_LTLIBRARIES = kcm_twinrules.la
noinst_LTLIBRARIES = libkwinrules.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 ruleswidgetbase.ui ruleslistbase.ui detectwidgetbase.ui editshortcutbase.ui
libkwinrules_la_LDFLAGS = $(all_libraries) -no-undefined libtwinrules_la_LDFLAGS = $(all_libraries) -no-undefined
libkwinrules_la_LIBADD = $(LIB_TDEUI) libtwinrules_la_LIBADD = $(LIB_TDEUI)
kcm_kwinrules_la_SOURCES = kcm.cpp kcm_twinrules_la_SOURCES = kcm.cpp
kcm_kwinrules_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined kcm_twinrules_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
kcm_kwinrules_la_LIBADD = libkwinrules.la kcm_twinrules_la_LIBADD = libtwinrules.la
kcm_kwinrules_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.h kcm_twinrules_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.h
kwin_rules_dialog_la_SOURCES = main.cpp twin_rules_dialog_la_SOURCES = main.cpp
kwin_rules_dialog_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined twin_rules_dialog_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
kwin_rules_dialog_la_LIBADD = libkwinrules.la twin_rules_dialog_la_LIBADD = libtwinrules.la
kwin_rules_dialog_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.h twin_rules_dialog_la_COMPILE_FIRST = ruleslistbase.h ruleswidgetbase.h editshortcutbase.h
messages: rc.cpp 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

@ -21,7 +21,7 @@
#include <kapplication.h> #include <kapplication.h>
#include <klocale.h> #include <klocale.h>
#include <kdebug.h> #include <kdebug.h>
#include <kwin.h> #include <twin.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqradiobutton.h> #include <tqradiobutton.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>

@ -23,7 +23,7 @@
#include "detectwidgetbase.h" #include "detectwidgetbase.h"
#include <kdialogbase.h> #include <kdialogbase.h>
#include <kwin.h> #include <twin.h>
#include "../../rules.h" #include "../../rules.h"

@ -28,10 +28,10 @@
#include "ruleslist.h" #include "ruleslist.h"
extern "C" 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? //CT there's need for decision: kwm or twin?
KGlobal::locale()->insertCatalogue( "kcmkwinrules" ); KGlobal::locale()->insertCatalogue( "kcmtwinrules" );
return new KWinInternal::KCMRules( parent, name ); return new KWinInternal::KCMRules( parent, name );
} }
@ -40,13 +40,13 @@ namespace KWinInternal
KCMRules::KCMRules( TQWidget *parent, const char *name ) KCMRules::KCMRules( TQWidget *parent, const char *name )
: KCModule( parent, name ) : KCModule( parent, name )
, config( "kwinrulesrc" ) , config( "twinrulesrc" )
{ {
TQVBoxLayout *layout = new TQVBoxLayout( this ); TQVBoxLayout *layout = new TQVBoxLayout( this );
widget = new KCMRulesList( this ); widget = new KCMRulesList( this );
layout->addWidget( TQT_TQWIDGET(widget) ); layout->addWidget( TQT_TQWIDGET(widget) );
connect( widget, TQT_SIGNAL( changed( bool )), TQT_SLOT( moduleChanged( bool ))); 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" ), I18N_NOOP( "Window-Specific Settings Configuration Module" ),
0, 0, KAboutData::License_GPL, I18N_NOOP( "(c) 2004 KWin and KControl Authors" )); 0, 0, KAboutData::License_GPL, I18N_NOOP( "(c) 2004 KWin and KControl Authors" ));
about->addAuthor("Lubos Lunak",0,"l.lunak@kde.org"); about->addAuthor("Lubos Lunak",0,"l.lunak@kde.org");
@ -64,11 +64,11 @@ void KCMRules::save()
{ {
widget->save(); widget->save();
emit KCModule::changed( false ); emit KCModule::changed( false );
// Send signal to kwin // Send signal to twin
config.sync(); config.sync();
if( !kapp->dcopClient()->isAttached()) if( !kapp->dcopClient()->isAttached())
kapp->dcopClient()->attach(); kapp->dcopClient()->attach();
kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
} }
void KCMRules::defaults() void KCMRules::defaults()

@ -1,12 +1,12 @@
[Desktop Entry] [Desktop Entry]
Icon=kcmkwm Icon=kcmkwm
Type=Application Type=Application
Exec=kcmshell kwinrules Exec=kcmshell twinrules
DocPath=kcontrol/windowmanagement/index.html DocPath=kcontrol/windowmanagement/index.html
X-KDE-ModuleType=Library X-KDE-ModuleType=Library
X-KDE-Library=kwinrules X-KDE-Library=twinrules
X-KDE-FactoryName=kwinrules X-KDE-FactoryName=twinrules
Name=Window-Specific Settings Name=Window-Specific Settings
Name[af]=Venser spesifike Instellings Name[af]=Venser spesifike Instellings

@ -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. // double implementation.
#include "ruleslist.h" #include "ruleslist.h"

@ -21,7 +21,7 @@
#include <dcopclient.h> #include <dcopclient.h>
#include <kconfig.h> #include <kconfig.h>
#include <klocale.h> #include <klocale.h>
#include <kwin.h> #include <twin.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <fixx11h.h> #include <fixx11h.h>
@ -34,7 +34,7 @@ namespace KWinInternal
static void loadRules( TQValueList< Rules* >& rules ) static void loadRules( TQValueList< Rules* >& rules )
{ {
KConfig cfg( "kwinrulesrc", true ); KConfig cfg( "twinrulesrc", true );
cfg.setGroup( "General" ); cfg.setGroup( "General" );
int count = cfg.readNumEntry( "count" ); int count = cfg.readNumEntry( "count" );
for( int i = 1; for( int i = 1;
@ -49,7 +49,7 @@ static void loadRules( TQValueList< Rules* >& rules )
static void saveRules( const TQValueList< Rules* >& rules ) static void saveRules( const TQValueList< Rules* >& rules )
{ {
KConfig cfg( "kwinrulesrc" ); KConfig cfg( "twinrulesrc" );
TQStringList groups = cfg.groupList(); TQStringList groups = cfg.groupList();
for( TQStringList::ConstIterator it = groups.begin(); for( TQStringList::ConstIterator it = groups.begin();
it != groups.end(); it != groups.end();
@ -258,7 +258,7 @@ static int edit( Window wid, bool whole_app )
saveRules( rules ); saveRules( rules );
if( !kapp->dcopClient()->isAttached()) if( !kapp->dcopClient()->isAttached())
kapp->dcopClient()->attach(); kapp->dcopClient()->attach();
kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString("")); kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
return 0; return 0;
} }
@ -275,8 +275,8 @@ static const KCmdLineOptions options[] =
extern "C" extern "C"
KDE_EXPORT int kdemain( int argc, char* argv[] ) KDE_EXPORT int kdemain( int argc, char* argv[] )
{ {
KLocale::setMainCatalogue( "kcmkwinrules" ); KLocale::setMainCatalogue( "kcmtwinrules" );
KCmdLineArgs::init( argc, argv, "kwin_rules_dialog", I18N_NOOP( "KWin" ), KCmdLineArgs::init( argc, argv, "twin_rules_dialog", I18N_NOOP( "KWin" ),
I18N_NOOP( "KWin helper utility" ), "1.0" ); I18N_NOOP( "KWin helper utility" ), "1.0" );
KCmdLineArgs::addCmdLineOptions( options ); KCmdLineArgs::addCmdLineOptions( options );
KApplication app; KApplication app;

@ -150,7 +150,7 @@ void KCMRulesList::load()
++it ) ++it )
delete *it; delete *it;
rules.clear(); rules.clear();
KConfig cfg( "kwinrulesrc", true ); KConfig cfg( "twinrulesrc", true );
cfg.setGroup( "General" ); cfg.setGroup( "General" );
int count = cfg.readNumEntry( "count" ); int count = cfg.readNumEntry( "count" );
rules.reserve( count ); rules.reserve( count );
@ -171,7 +171,7 @@ void KCMRulesList::load()
void KCMRulesList::save() void KCMRulesList::save()
{ {
KConfig cfg( "kwinrulesrc" ); KConfig cfg( "twinrulesrc" );
TQStringList groups = cfg.groupList(); TQStringList groups = cfg.groupList();
for( TQStringList::ConstIterator it = groups.begin(); for( TQStringList::ConstIterator it = groups.begin();
it != groups.end(); it != groups.end();

@ -24,7 +24,7 @@
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <klocale.h> #include <klocale.h>
#include <tqregexp.h> #include <tqregexp.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>

@ -21,7 +21,7 @@
#define __RULESWIDGET_H__ #define __RULESWIDGET_H__
#include <kdialogbase.h> #include <kdialogbase.h>
#include <kwin.h> #include <twin.h>
#include <kshortcutdialog.h> #include <kshortcutdialog.h>
#include "ruleswidgetbase.h" #include "ruleswidgetbase.h"

@ -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 SOURCES killer.cpp
LINK tdeui-shared LINK tdeui-shared
DESTINATION ${BIN_INSTALL_DIR} DESTINATION ${BIN_INSTALL_DIR}

@ -1,9 +1,9 @@
INCLUDES = $(all_includes) INCLUDES = $(all_includes)
bin_PROGRAMS = kwin_killer_helper bin_PROGRAMS = twin_killer_helper
kwin_killer_helper_SOURCES = killer.cpp twin_killer_helper_SOURCES = killer.cpp
kwin_killer_helper_LDADD = $(LIB_TDEUI) twin_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_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
METASOURCES = AUTO METASOURCES = AUTO

@ -28,7 +28,7 @@ DEALINGS IN THE SOFTWARE.
#include <kprocess.h> #include <kprocess.h>
#include <klocale.h> #include <klocale.h>
#include <unistd.h> #include <unistd.h>
#include <kwin.h> #include <twin.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
static const KCmdLineOptions options[] = static const KCmdLineOptions options[] =
@ -45,8 +45,8 @@ static const KCmdLineOptions options[] =
int main( int argc, char* argv[] ) int main( int argc, char* argv[] )
{ {
KLocale::setMainCatalogue( "kwin" ); // the messages are in kwin's .po file KLocale::setMainCatalogue( "twin" ); // the messages are in twin's .po file
KCmdLineArgs::init( argc, argv, "kwin_killer_helper", I18N_NOOP( "KWin" ), KCmdLineArgs::init( argc, argv, "twin_killer_helper", I18N_NOOP( "KWin" ),
I18N_NOOP( "KWin helper utility" ), "1.0" ); I18N_NOOP( "KWin helper utility" ), "1.0" );
KCmdLineArgs::addCmdLineOptions( options ); KCmdLineArgs::addCmdLineOptions( options );
KApplication app; KApplication app;

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<kcfgfile name="kwinrc" /> <kcfgfile name="twinrc" />
<group name="Desktops" > <group name="Desktops" >
<entry key="Name_1" type="String" /> <entry key="Name_1" type="String" />
<entry key="Name_2" type="String" /> <entry key="Name_2" type="String" />

@ -15,7 +15,7 @@
// some shortcuts have Tarzan-speech like names, they need extra normal human descriptions with DEF2() // some shortcuts have Tarzan-speech like names, they need extra normal human descriptions with DEF2()
// the others can use DEF() // the others can use DEF()
keys->insert( "Program:kwin", i18n("System") ); keys->insert( "Program:twin", i18n("System") );
keys->insert( "Group:Navigation", i18n("Navigation") ); keys->insert( "Group:Navigation", i18n("Navigation") );
DEF( I18N_NOOP("Walk Through Windows"), ALT+Qt::Key_Tab, ALT+Qt::Key_Tab, slotWalkThroughWindows() ); DEF( I18N_NOOP("Walk Through Windows"), ALT+Qt::Key_Tab, ALT+Qt::Key_Tab, slotWalkThroughWindows() );

@ -149,7 +149,7 @@ void Workspace::propagateClients( bool propagate_new_clients )
// Stack all windows under the support window. The support window is // Stack all windows under the support window. The support window is
// not used for anything (besides the NETWM property), and it's not shown, // 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 // it ensures that no client will be ever shown above override-redirect
// windows (e.g. popups). // windows (e.g. popups).
#if 0 #if 0
@ -717,7 +717,7 @@ bool Workspace::keepTransientAbove( const Client* mainwindow, const Client* tran
return false; return false;
// This is rather a hack for #76026. Don't keep non-modal dialogs above // 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 // 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. // needs to be found.
if( transient->isDialog() && !transient->isModal() && transient->groupTransient()) if( transient->isDialog() && !transient->isModal() && transient->groupTransient())
return false; return false;

@ -1,4 +1,4 @@
# FRAME libkwin??? # FRAME libtwin???
lib_LTLIBRARIES = libtdecorations.la lib_LTLIBRARIES = libtdecorations.la
libtdecorations_la_SOURCES = kdecoration.cpp kdecoration_p.cpp kdecoration_plugins_p.cpp \ libtdecorations_la_SOURCES = kdecoration.cpp kdecoration_p.cpp kdecoration_plugins_p.cpp \
@ -16,5 +16,5 @@ METASOURCES = AUTO
include ../../admin/Doxyfile.am include ../../admin/Doxyfile.am
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) `find . -name \*.cpp` -o $(podir)/kwin_lib.pot $(XGETTEXT) `find . -name \*.cpp` -o $(podir)/twin_lib.pot
-rm rc.cpp -rm rc.cpp

@ -582,7 +582,7 @@ class KWIN_EXPORT KDecoration
// mustn't do any repaints, resizes or anything like that // mustn't do any repaints, resizes or anything like that
virtual void borders( int& left, int& right, int& top, int& bottom ) const = 0; 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 * The usual implementation is to resize the main widget of the decoration to the
* given size. * given size.
* *

@ -42,7 +42,7 @@ KDecorationPlugins::KDecorationPlugins( KConfig* cfg )
fact( NULL ), fact( NULL ),
old_library( NULL ), old_library( NULL ),
old_fact( NULL ), old_fact( NULL ),
pluginStr( "kwin3_undefined " ), pluginStr( "twin3_undefined " ),
config( cfg ) config( cfg )
{ {
} }
@ -98,9 +98,9 @@ bool KDecorationPlugins::loadPlugin( TQString nameStr )
KConfigGroupSaver saver( config, "Style" ); KConfigGroupSaver saver( config, "Style" );
nameStr = config->readEntry("PluginLib", defaultPlugin ); nameStr = config->readEntry("PluginLib", defaultPlugin );
} }
// make sure people can switch between HEAD and kwin_iii branch // make sure people can switch between HEAD and twin_iii branch
if( nameStr.startsWith( "kwin_" )) if( nameStr.startsWith( "twin_" ))
nameStr = "kwin3_" + nameStr.mid( 5 ); nameStr = "twin3_" + nameStr.mid( 5 );
KLibrary *oldLibrary = library; KLibrary *oldLibrary = library;
KDecorationFactory* oldFactory = fact; KDecorationFactory* oldFactory = fact;
@ -114,7 +114,7 @@ bool KDecorationPlugins::loadPlugin( TQString nameStr )
path = KLibLoader::findLibrary(TQFile::encodeName(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()) if (path.isEmpty())
{ {
error( i18n("No window decoration plugin library was found." )); error( i18n("No window decoration plugin library was found." ));
@ -167,14 +167,14 @@ bool KDecorationPlugins::loadPlugin( TQString nameStr )
// For clients in kdeartwork // For clients in kdeartwork
TQString catalogue = nameStr; TQString catalogue = nameStr;
catalogue.replace( "kwin3_", "kwin_" ); catalogue.replace( "twin3_", "twin_" );
KGlobal::locale()->insertCatalogue( catalogue ); KGlobal::locale()->insertCatalogue( catalogue );
// For KCommonDecoration based clients // For KCommonDecoration based clients
KGlobal::locale()->insertCatalogue( "kwin_lib" ); KGlobal::locale()->insertCatalogue( "twin_lib" );
// For clients in kdebase // For clients in kdebase
KGlobal::locale()->insertCatalogue( "kwin_clients" ); KGlobal::locale()->insertCatalogue( "twin_clients" );
// For clients in kdeartwork // For clients in kdeartwork
KGlobal::locale()->insertCatalogue( "kwin_art_clients" ); KGlobal::locale()->insertCatalogue( "twin_art_clients" );
old_library = oldLibrary; // save for delayed destroying old_library = oldLibrary; // save for delayed destroying
old_fact = oldFactory; old_fact = oldFactory;

@ -60,7 +60,7 @@ int x11ErrorHandler(Display *d, XErrorEvent *e)
) )
&& (e->error_code == BadAccess)) && (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); exit(1);
} }
@ -71,11 +71,11 @@ int x11ErrorHandler(Display *d, XErrorEvent *e)
sprintf(number, "%d", e->request_code); sprintf(number, "%d", e->request_code);
XGetErrorDatabaseText(d, "XRequest", number, "<unknown>", req, sizeof(req)); 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) if (initting)
{ {
fputs(i18n("kwin: failure during initialization; aborting").local8Bit(), stderr); fputs(i18n("twin: failure during initialization; aborting").local8Bit(), stderr);
exit(1); exit(1);
} }
return 0; return 0;
@ -116,9 +116,9 @@ Application::Application( )
int format; int format;
unsigned long n, left; unsigned long n, left;
unsigned char *data; 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, XA_ATOM, &actual, &format,
&n, &left, &data); &n, &left, &data);
@ -129,25 +129,25 @@ Application::Application( )
XFree ( (void *) data); XFree ( (void *) data);
if( !owner.claim( true, true )) 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); ::exit(1);
} }
} }
else 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); ::exit(1);
} }
} }
else 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); ::exit(1);
} }
} }
connect( &owner, TQT_SIGNAL( lostOwnership()), TQT_SLOT( lostSelection())); 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(); config()->reparseConfiguration();
initting = TRUE; // startup.... initting = TRUE; // startup....
@ -253,7 +253,7 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
if (! restored) if (! restored)
{ {
// we only do the multihead fork if we are not restored by the session // 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... // one for each screen...
TQCString multiHead = getenv("KDE_MULTIHEAD"); TQCString multiHead = getenv("KDE_MULTIHEAD");
if (multiHead.lower() == "true") 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++ ) 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 // acts exactly as previously
if ( i != KWinInternal::screen_number && fork() == 0 ) 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, version, description, KAboutData::License_GPL,
I18N_NOOP("(c) 1999-2005, The KDE Developers")); I18N_NOOP("(c) 1999-2005, The KDE Developers"));
aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org"); aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org");
@ -336,9 +336,9 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
TQCString appname; TQCString appname;
if (KWinInternal::screen_number == 0) if (KWinInternal::screen_number == 0)
appname = "kwin"; appname = "twin";
else else
appname.sprintf("kwin-screen-%d", KWinInternal::screen_number); appname.sprintf("twin-screen-%d", KWinInternal::screen_number);
DCOPClient* client = a.dcopClient(); DCOPClient* client = a.dcopClient();
client->registerAs( appname.data(), false); client->registerAs( appname.data(), false);

@ -10,5 +10,5 @@
################################################# #################################################
install( FILES install( FILES
options.h client.h workspace.h kwinbutton.h options.h client.h workspace.h twinbutton.h
DESTINATION ${INCLUDE_INSTALL_DIR}/kwin ) DESTINATION ${INCLUDE_INSTALL_DIR}/twin )

@ -1,2 +1,2 @@
kwin_kwinincludedir = $(includedir)/kwin twin_twinincludedir = $(includedir)/twin
kwin_kwininclude_HEADERS = options.h client.h workspace.h kwinbutton.h twin_twininclude_HEADERS = options.h client.h workspace.h twinbutton.h

@ -1,4 +1,4 @@
#error The KWin decorations API provided by this header file is obsolete. #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. #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 .

@ -1,4 +1,4 @@
#error The KWin decorations API provided by this header file is obsolete. #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. #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 .

@ -1,4 +1,4 @@
#error The KWin decorations API provided by this header file is obsolete. #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. #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 .

@ -1,4 +1,4 @@
#error The KWin decorations API provided by this header file is obsolete. #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. #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 .

@ -13,4 +13,4 @@ install( FILES
close.png maximize.png maximizedown.png menu.png close.png maximize.png maximizedown.png menu.png
iconify.png pindown.png pinup.png unknown.png fog.png iconify.png pindown.png pinup.png unknown.png fog.png
fog-grey.png bluesun.png greenie.light.png greenie.dim.png fog-grey.png bluesun.png greenie.light.png greenie.dim.png
DESTINATION ${DATA_INSTALL_DIR}/kwin/pics ) DESTINATION ${DATA_INSTALL_DIR}/twin/pics )

@ -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 \ iconify.png pindown.png pinup.png unknown.png fog.png \
fog-grey.png bluesun.png greenie.light.png greenie.dim.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)

@ -132,7 +132,7 @@ void Placement::placeSmart(Client* c, const TQRect& area, Policy /*next*/ )
{ {
/* /*
* SmartPlacement by Cristian Tibirna (tibirna@kde.org) * 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 * permission) ideas from fvwm, authored by
* Anthony Martin (amartin@engr.csulb.edu). * Anthony Martin (amartin@engr.csulb.edu).
* Xinerama supported added by Balaji Ramani (balaji@yablibli.com) * 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*/ ) 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 // 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 // if there's not enough place outside the mainwindow, it should prefer
// top-right corner // top-right corner

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

@ -877,7 +877,7 @@ void Client::finishWindowRules()
} }
void Client::checkAndSetInitialRuledOpacity() 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; int tmp;
@ -950,7 +950,7 @@ void Workspace::editWindowRules( Client* c, bool whole_app )
args << "--wid" << TQString::number( c->window()); args << "--wid" << TQString::number( c->window());
if( whole_app ) if( whole_app )
args << "--whole-app"; args << "--whole-app";
KApplication::tdeinitExec( "kwin_rules_dialog", args ); KApplication::tdeinitExec( "twin_rules_dialog", args );
} }
void Workspace::loadWindowRules() void Workspace::loadWindowRules()
@ -960,7 +960,7 @@ void Workspace::loadWindowRules()
delete rules.front(); delete rules.front();
rules.pop_front(); rules.pop_front();
} }
KConfig cfg( "kwinrulesrc", true ); KConfig cfg( "twinrulesrc", true );
cfg.setGroup( "General" ); cfg.setGroup( "General" );
int count = cfg.readNumEntry( "count" ); int count = cfg.readNumEntry( "count" );
for( int i = 1; for( int i = 1;
@ -976,7 +976,7 @@ void Workspace::loadWindowRules()
void Workspace::writeWindowRules() void Workspace::writeWindowRules()
{ {
rulesUpdatedTimer.stop(); rulesUpdatedTimer.stop();
KConfig cfg( "kwinrulesrc" ); KConfig cfg( "twinrulesrc" );
TQStringList groups = cfg.groupList(); TQStringList groups = cfg.groupList();
for( TQStringList::ConstIterator it = groups.begin(); for( TQStringList::ConstIterator it = groups.begin();
it != groups.end(); it != groups.end();

@ -30,7 +30,7 @@ namespace KWinInternal
class Client; class Client;
class Rules; class Rules;
#ifndef KCMRULES // only for kwin core #ifndef KCMRULES // only for twin core
class WindowRules class WindowRules
: public KDecorationDefines : public KDecorationDefines

@ -38,7 +38,7 @@ License. See the file "COPYING" for the exact licensing terms.
namespace KWinInternal namespace KWinInternal
{ {
extern TQPixmap* kwin_get_menu_pix_hack(); extern TQPixmap* twin_get_menu_pix_hack();
TabBox::TabBox( Workspace *ws, const char *name ) TabBox::TabBox( Workspace *ws, const char *name )
: TQFrame( 0, name, TQt::WNoAutoErase ), current_client( NULL ), wspace(ws) : TQFrame( 0, name, TQt::WNoAutoErase ), current_client( NULL ), wspace(ws)
@ -375,7 +375,7 @@ void TabBox::drawContents( TQPainter * )
TQPainter p; TQPainter p;
p.tqbegin(&pix, this); 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 iconWidth = showMiniIcon ? 16 : 32;
int x = 0; int x = 0;

@ -39,7 +39,7 @@
static KCmdLineOptions options[] = 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 }, { "+tests", "Which test should be executed ('all', 'tqrepaint', 'caption', 'resize', 'recreation')", 0 },
{ "+repetitions", "Number of test repetitions.", 0 }, { "+repetitions", "Number of test repetitions.", 0 },
{ 0, 0, 0 } { 0, 0, 0 }
@ -49,10 +49,10 @@ DecoBenchApplication::DecoBenchApplication(const TQString &library, Tests tests,
m_tests(tests), m_tests(tests),
m_count(count) m_count(count)
{ {
KConfig kwinConfig("kwinrc"); KConfig twinConfig("twinrc");
kwinConfig.setGroup("Style"); twinConfig.setGroup("Style");
plugins = new KDecorationPreviewPlugins( &kwinConfig ); plugins = new KDecorationPreviewPlugins( &twinConfig );
preview = new KDecorationPreview( plugins, 0 ); preview = new KDecorationPreview( plugins, 0 );
if (plugins->loadPlugin(library) ) if (plugins->loadPlugin(library) )
@ -101,7 +101,7 @@ int main(int argc, char** argv)
{ {
TQString style = "keramik"; TQString style = "keramik";
// KApplication app(argc, argv); // 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::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions( options ); KCmdLineArgs::addCmdLineOptions( options );

@ -397,7 +397,7 @@ KDecorationPreviewOptions::~KDecorationPreviewOptions()
unsigned long KDecorationPreviewOptions::updateSettings() unsigned long KDecorationPreviewOptions::updateSettings()
{ {
KConfig cfg( "kwinrc", true ); KConfig cfg( "twinrc", true );
unsigned long changed = 0; unsigned long changed = 0;
changed |= d->updateKWinSettings( &cfg ); changed |= d->updateKWinSettings( &cfg );

@ -258,7 +258,7 @@ void Workspace::initShortcuts()
disable_shortcuts_keys = new KGlobalAccel( this ); disable_shortcuts_keys = new KGlobalAccel( this );
disable_shortcuts_keys->disableBlocking( true ); disable_shortcuts_keys->disableBlocking( true );
#define IN_KWIN #define IN_KWIN
#include "kwinbindings.cpp" #include "twinbindings.cpp"
readShortcuts(); readShortcuts();
} }
@ -1023,7 +1023,7 @@ void Workspace::slotWindowOperations()
void Workspace::showWindowMenu( const TQRect &pos, Client* cl ) void Workspace::showWindowMenu( const TQRect &pos, Client* cl )
{ {
if (!kapp->authorizeKAction("kwin_rmb")) if (!kapp->authorizeKAction("twin_rmb"))
return; return;
if( !cl ) if( !cl )
return; return;

@ -47,8 +47,8 @@ namespace KWinInternal
// used to store the return values of // used to store the return values of
// XShapeQueryExtension. // XShapeQueryExtension.
// Necessary since tqshaped window are an extension to X // Necessary since tqshaped window are an extension to X
int Shape::kwin_tqshape_version = 0; int Shape::twin_tqshape_version = 0;
int Shape::kwin_tqshape_event = 0; int Shape::twin_tqshape_event = 0;
// does the window w need a tqshape combine mask around it? // does the window w need a tqshape combine mask around it?
bool Shape::hasShape( WId w) bool Shape::hasShape( WId w)
@ -66,19 +66,19 @@ bool Shape::hasShape( WId w)
int Shape::tqshapeEvent() int Shape::tqshapeEvent()
{ {
return kwin_tqshape_event; return twin_tqshape_event;
} }
void Shape::init() void Shape::init()
{ {
kwin_tqshape_version = 0; twin_tqshape_version = 0;
int dummy; int dummy;
if( !XShapeQueryExtension(qt_xdisplay(), &kwin_tqshape_event, &dummy)) if( !XShapeQueryExtension(qt_xdisplay(), &twin_tqshape_event, &dummy))
return; return;
int major, minor; int major, minor;
if( !XShapeQueryVersion( qt_xdisplay(), &major, &minor )) if( !XShapeQueryVersion( qt_xdisplay(), &major, &minor ))
return; return;
kwin_tqshape_version = major * 0x10 + minor; twin_tqshape_version = major * 0x10 + minor;
} }
void Motif::readFlags( WId w, bool& noborder, bool& resize, bool& move, void Motif::readFlags( WId w, bool& noborder, bool& resize, bool& move,
@ -263,7 +263,7 @@ void updateXTime()
if ( !w ) if ( !w )
w = new TQWidget; w = new TQWidget;
long data = 1; 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); PropModeAppend, (unsigned char*) &data, 1);
next_x_time = CurrentTime; next_x_time = CurrentTime;
XEvent dummy; XEvent dummy;

@ -111,14 +111,14 @@ enum ShadeMode
class Shape class Shape
{ {
public: public:
static bool available() { return kwin_tqshape_version > 0; } static bool available() { return twin_tqshape_version > 0; }
static int version() { return kwin_tqshape_version; } // as 16*major+minor, i.e. two hex digits static int version() { return twin_tqshape_version; } // as 16*major+minor, i.e. two hex digits
static bool hasShape( WId w); static bool hasShape( WId w);
static int tqshapeEvent(); static int tqshapeEvent();
static void init(); static void init();
private: private:
static int kwin_tqshape_version; static int twin_tqshape_version;
static int kwin_tqshape_event; static int twin_tqshape_event;
}; };
// compile with XShape older than 1.0 // compile with XShape older than 1.0

@ -193,8 +193,8 @@ Workspace::Workspace( bool restore )
XChangeProperty( XChangeProperty(
qt_xdisplay(), qt_xdisplay(),
qt_xrootwin(), qt_xrootwin(),
atoms->kwin_running, atoms->twin_running,
atoms->kwin_running, atoms->twin_running,
32, 32,
PropModeAppend, PropModeAppend,
(unsigned char*) &data, (unsigned char*) &data,
@ -501,7 +501,7 @@ Workspace::~Workspace()
delete kompmgr; delete kompmgr;
blockStackingUpdates( true ); blockStackingUpdates( true );
// TODO grabXServer(); // 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(); for( ClientList::ConstIterator it = stacking_order.begin();
it != stacking_order.end(); it != stacking_order.end();
++it ) ++it )
@ -519,7 +519,7 @@ Workspace::~Workspace()
delete popupinfo; delete popupinfo;
delete popup; delete popup;
if ( root == qt_xrootwin() ) if ( root == qt_xrootwin() )
XDeleteProperty(qt_xdisplay(), qt_xrootwin(), atoms->kwin_running); XDeleteProperty(qt_xdisplay(), qt_xrootwin(), atoms->twin_running);
writeWindowRules(); writeWindowRules();
KGlobal::config()->sync(); KGlobal::config()->sync();
@ -1209,11 +1209,11 @@ void Workspace::saveDesktopSettings()
TQStringList Workspace::configModules(bool controlCenter) TQStringList Workspace::configModules(bool controlCenter)
{ {
TQStringList args; TQStringList args;
args << "kde-kwindecoration.desktop"; args << "kde-twindecoration.desktop";
if (controlCenter) if (controlCenter)
args << "kde-kwinoptions.desktop"; args << "kde-twinoptions.desktop";
else if (kapp->authorizeControlModule("kde-kwinoptions.desktop")) else if (kapp->authorizeControlModule("kde-twinoptions.desktop"))
args << "kwinactions" << "kwinfocus" << "kwinmoving" << "kwinadvanced" << "kwinrules" << "kwintranslucency"; args << "twinactions" << "twinfocus" << "twinmoving" << "twinadvanced" << "twinrules" << "twintranslucency";
return args; return args;
} }
@ -2670,11 +2670,11 @@ void Workspace::helperDialog( const TQString& message, const Client* c )
proc << "kdialog" << args; proc << "kdialog" << args;
if( !type.isEmpty()) if( !type.isEmpty())
{ {
KConfig cfg( "kwin_dialogsrc" ); KConfig cfg( "twin_dialogsrc" );
cfg.setGroup( "Notification Messages" ); // this depends on KMessageBox cfg.setGroup( "Notification Messages" ); // this depends on KMessageBox
if( !cfg.readBoolEntry( type, true )) // has don't show again checked if( !cfg.readBoolEntry( type, true )) // has don't show again checked
return; // save launching kdialog return; // save launching kdialog
proc << "--dontagain" << "kwin_dialogsrc:" + type; proc << "--dontagain" << "twin_dialogsrc:" + type;
} }
if( c != NULL ) if( c != NULL )
proc << "--embed" << TQString::number( c->window()); 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 // 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 // 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 // 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. // a new window resets the state but doesn't show windows.
void Workspace::resetShowingDesktop( bool keep_hidden ) void Workspace::resetShowingDesktop( bool keep_hidden )
{ {
@ -2974,14 +2974,14 @@ void Workspace::disableGlobalShortcutsForClient( bool disable )
if( disable ) if( disable )
pending_dfc = true; pending_dfc = true;
KIPC::sendMessageAll( KIPC::BlockShortcuts, disable ); KIPC::sendMessageAll( KIPC::BlockShortcuts, disable );
// kwin will get the kipc message too // twin will get the kipc message too
} }
} }
void Workspace::disableGlobalShortcuts( bool disable ) void Workspace::disableGlobalShortcuts( bool disable )
{ {
KIPC::sendMessageAll( KIPC::BlockShortcuts, 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 ) void Workspace::kipcMessage( int id, int data )

@ -38,8 +38,8 @@ DESCRIPTION
#include <kglobalaccel.h> #include <kglobalaccel.h>
#include <klocale.h> #include <klocale.h>
#include <kprocess.h> #include <kprocess.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <kwin.h> #include <twin.h>
#include <ktempfile.h> #include <ktempfile.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kipc.h> #include <kipc.h>

@ -18,7 +18,7 @@
#include <tqptrqueue.h> #include <tqptrqueue.h>
#include <tqmap.h> #include <tqmap.h>
#include <kwinmodule.h> #include <twinmodule.h>
#include <kdebug.h> #include <kdebug.h>
#include "kxkbconfig.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) # start only dcopserver, don't start whole tdeinit (takes too long)
echo "[startkde] Running kpersonalizer..." 1>&2 echo "[startkde] Running kpersonalizer..." 1>&2
dcopserver dcopserver
kwin --lock & twin --lock &
kpersonalizer --before-session kpersonalizer --before-session
# handle kpersonalizer restarts (language change) # handle kpersonalizer restarts (language change)
while test $? -eq 1; do while test $? -eq 1; do
kpersonalizer --r --before-session kpersonalizer --r --before-session
done done
dcopquit kwin dcopquit twin
dcopserver_shutdown --wait dcopserver_shutdown --wait
fi fi
fi fi
@ -568,8 +568,8 @@ fi
# Finally, give the session control to the session manager. # Finally, give the session control to the session manager.
# See kdebase/ksmserver for the description of the rest of the startup sequence. # 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 # If the KDEWM environment variable has been set, then it will be used as Trinity's
# window manager instead of kwin. # window manager instead of twin.
# If KDEWM is not set, ksmserver will ensure kwin is started. # If KDEWM is not set, ksmserver will ensure twin is started.
# kwrapper is used to reduce startup time and memory usage # kwrapper is used to reduce startup time and memory usage
# kwrapper does not return usefull error codes such as the exit code of ksmserver. # 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 # We only check for 255 which means that the ksmserver process could not be

@ -32,7 +32,7 @@
#include <kdebug.h> #include <kdebug.h>
#include <kiconloader.h> #include <kiconloader.h>
#include <kpopupmenu.h> #include <kpopupmenu.h>
#include <kwin.h> #include <twin.h>
#include <kstartupinfo.h> #include <kstartupinfo.h>
class JobTray : public KSystemTray class JobTray : public KSystemTray

@ -43,7 +43,7 @@
#include <kmimetype.h> #include <kmimetype.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <kapplication.h> #include <kapplication.h>
#include <kwin.h> #include <twin.h>
#include <kemailsettings.h> #include <kemailsettings.h>
#include <kdebug.h> #include <kdebug.h>
#include <kstdguiitem.h> #include <kstdguiitem.h>

@ -28,7 +28,7 @@
#include <kglobalsettings.h> #include <kglobalsettings.h>
#include <klocale.h> #include <klocale.h>
#include <krecentdocument.h> #include <krecentdocument.h>
#include <kwin.h> #include <twin.h>
#include <tqtimer.h> #include <tqtimer.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>

Loading…
Cancel
Save