TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename kwin to twin (part 1 of 2)

Browse Source
pull/2/head
Timothy Pearson 14 years ago
parent 6354e6b3ba
commit 43d99cc247
310 changed files with 1407 additions and 1407 deletions
Show Stats Download Patch File Download Diff File

4
CMakeLists.txt
Unescape Escape View File

@ -87,7 +87,7 @@ option( BUILD_DOC "Build doc" ${BUILD_ALL} )
option( BUILD_LIBKONQ "Build libkonq" ${BUILD_ALL} )
option( BUILD_KCMINIT "Build kcminit" ${BUILD_ALL} )
option( BUILD_KCONTROL "Build kcontrol" ${BUILD_ALL} )
option( BUILD_KWIN "Build kwin" ${BUILD_ALL} )
option( BUILD_KWIN "Build twin" ${BUILD_ALL} )
option( BUILD_KATE "Build kate" ${BUILD_ALL} )
option( BUILD_KONQUEROR "Build konqueror" ${BUILD_ALL} )
option( BUILD_KIOSLAVES "Build kioslaves" ${BUILD_ALL} )
@ -161,7 +161,7 @@ tde_conditional_add_subdirectory( BUILD_DOC doc )
tde_conditional_add_subdirectory( BUILD_LIBKONQ libkonq )
tde_conditional_add_subdirectory( BUILD_KCMINIT kcminit )
add_subdirectory( kcontrol )
tde_conditional_add_subdirectory( BUILD_KWIN kwin )
tde_conditional_add_subdirectory( BUILD_KWIN twin )
tde_conditional_add_subdirectory( BUILD_KATE kate )
tde_conditional_add_subdirectory( BUILD_KONQUEROR konqueror )
tde_conditional_add_subdirectory( BUILD_KIOSLAVES kioslave )

8
ConfigureChecks.cmake
Unescape Escape View File

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

2
README
Unescape Escape View File

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

2
doc/faq/intro.docbook
Unescape Escape View File

@ -45,7 +45,7 @@ particular the &gcc; compiler.</para>
</question>
<answer>
<para>No, &kde; is not a window manager. While &kde; includes a very
sophisticated window manager (&kwin;), &kde; is much more than that.
sophisticated window manager (&twin;), &kde; is much more than that.
It is a full-blown Integrated Desktop Environment.</para>
<para>&kde; provides a complete desktop environment, including a web
browser, a file manager, a window manager, a help system, a

2
doc/faq/misc.docbook
Unescape Escape View File

@ -15,7 +15,7 @@
<para>Does &kde; support transparency and other visual effects provided by the new composite extension to X.org?</para>
</question>
<answer>
<para> Yes! An exciting new feature for &kde; 3.4 is support for the new X composite extension. This allows for effects such as translucency and drop shadows for all windows, easily configurable through &kwin;'s configuration dialog. This requires you to be using X.org version 6.8.0 or newer and have:
<para> Yes! An exciting new feature for &kde; 3.4 is support for the new X composite extension. This allows for effects such as translucency and drop shadows for all windows, easily configurable through &twin;'s configuration dialog. This requires you to be using X.org version 6.8.0 or newer and have:
<screen>
Section "Extensions"

6
doc/faq/winmng.docbook
Unescape Escape View File

@ -10,14 +10,14 @@
<title>The window manager</title>
<para>The default window manager provided by &kde; is the K Window
Manager (&kwin;). Please read <quote>The
Manager (&twin;). Please read <quote>The
K Window Manager Handbook</quote> (which should be accessible from the
<application>&kde; Help Center</application>) for usage information.</para>
<qandaset>
<qandaentry>
<question>
<para>Are there keyboard shortcuts for &kwin; operations?</para>
<para>Are there keyboard shortcuts for &twin; operations?</para>
</question>
<answer>
<para>Yes. Please refer to "The K Window Manager Handbook" for the
@ -58,7 +58,7 @@ Iconified tasks will have their names displayed in gray.</para>
</listitem>
<listitem>
<para>If you click the &MMB; on the root window (&ie;,
the background of the desktop), &kwin; will give you a list
the background of the desktop), &twin; will give you a list
of all available tasks.</para>
</listitem>
</itemizedlist>

2
doc/kcontrol/kwindecoration/CMakeLists.txt
Unescape Escape View File

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

2
doc/kcontrol/kwindecoration/Makefile.am
Unescape Escape View File

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

2
doc/kcontrol/kwindecoration/index.docbook
Unescape Escape View File

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

2
doc/kcontrol/windowmanagement/index.docbook
Unescape Escape View File

@ -32,7 +32,7 @@ some windows.</para>
<note>
<para>Please note that this configuration will not take effect if you
do not use &kwin; as your window manager. If you do use a different
do not use &twin; as your window manager. If you do use a different
window manager, please refer to its documentation for how to customize
window behavior.</para>
</note>

6
doc/kompmgr/index.docbook
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kappname "kompmgr">
<!ENTITY package "kwin">
<!ENTITY package "twin">
<!ENTITY % English "INCLUDE">
<!ENTITY % addindex "IGNORE">
]>
@ -30,7 +30,7 @@
<releaseinfo>2.0.1</releaseinfo>
<abstract>
<para>&kappname; is a composite rendering engine to be used by &kwin;.</para>
<para>&kappname; is a composite rendering engine to be used by &twin;.</para>
<para>This document is rather a general explanation of what it does,
how it works and what the restrictions are than a documentation how to use
it (as it works in the background automatically).</para>
@ -38,7 +38,7 @@ it (as it works in the background automatically).</para>
<keywordset>
<keyword>KDE</keyword>
<keyword>kwin</keyword>
<keyword>twin</keyword>
<keyword>render engine</keyword>
</keywordset>
</bookinfo>

2
doc/userguide/control-center.docbook
Unescape Escape View File

@ -252,7 +252,7 @@ mouse buttons.</para>
<term><guilabel>Window Behavior</guilabel></term>
<listitem>
<para>This is where you would configure options related to the behavior of
&kde;'s window manager, &kwin;. &kwin; is extremely configurable and has
&kde;'s window manager, &twin;. &twin; is extremely configurable and has
advanced features such as focus stealing prevention and different focus
policies such as focus follows mouse. You can also configure what actions
you would like to bind to certain keys and mouse events.</para>

4
doc/userguide/customizing-desktop.docbook
Unescape Escape View File

@ -118,7 +118,7 @@ to apply effects such as translucency. Window decorations must be able to do all
these without sacrificing speed and performance. This is the reason why window
decorations come in source code that must be compiled, or as binary packages
that must be installed. Basically, Window decorations are plugins or small
programs that instruct &kwin;, &kde;'s Window Manager,
programs that instruct &twin;, &kde;'s Window Manager,
how to display window frames.</para>
<para>In order to add a new window decoration, you need to compile it from
@ -153,7 +153,7 @@ while this may be unnoticeable on very fast systems.</para>
<para>To add an IceWM theme, select IceWM as the window decoration and click on
the <guilabel>Open &kde;'s IceWM theme folder</guilabel> link in the window
decoration description area. This will open a &konqueror; window
to <filename>$<envar>KDEHOME</envar>/share/apps/kwin/icewm-themes</filename>.
to <filename>$<envar>KDEHOME</envar>/share/apps/twin/icewm-themes</filename>.
Extract your IceWM theme to this folder. The theme will then be added to
the list of IceWM themes. Select the theme you want to use and click on
<guibutton>Apply</guibutton>.</para>

4
doc/userguide/kde-for-admins.docbook
Unescape Escape View File

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

4
doc/userguide/under-the-hood.docbook
Unescape Escape View File

@ -381,13 +381,13 @@ the one with the <guiicon>Next Page</guiicon> picture on it.
</step>
<step>
<para>In the <guilabel>Command/URL Settings</guilabel> tab, enter the
command to run in the field: <userinput><command>dcop kwin default
command to run in the field: <userinput><command>dcop twin default
nextDesktop</command></userinput></para>
</step>
</procedure>
<para>Repeat the above with the <keysym>Prev_Virtual_Screen</keysym> key and
<userinput><command>dcop kwin default
<userinput><command>dcop twin default
previousDesktop</command></userinput>.</para>
<para>Now pressing the <keysym>Prev_Virtual_Screen</keysym> or

2
drkonqi/presets/enduserrc
Unescape Escape View File

@ -492,7 +492,7 @@ Comment[uz@cyrillic]=Дастурнинг иши SIGABRT сигнали била
Comment[ven]==Apulikhesheni i fhela nga luswayo lwa SIGABRT musi i tshi sedzulusa mifhirifhiri ya nga mgomu yo vhangwaho nga baga kha mbekanyamushumo.
Comment[vi]=Một chương trình bị dừng bởi một tín hiệu SIGABRT khi nó tìm ra một mâu thuẫn nội bộ gây ra bởi lỗi nào đó.
Comment[wa]=On programe a fini avou on signå SIGABRT cwand il a trové ene divintrinne inconsistance a cåze d' on bug dins l' programe.
Comment[xh]=Isicelo sicinywa ngophawu lwe SIGABRT xa sibona ukungahambisalani kwangaphakathi okwenziwa ligciwane kwinkqubo.
Comment[xh]=Isicelo sicinywa ngophawu lwe SIGABRT xa sibona ukungahambisalani kwangaphakathi okwenziwa ligciwane twinkqubo.
Comment[zh_CN]=程序在检测到缺陷引起的内部不一致时，以 SIGABRT 信号中止。
Comment[zh_TW]=程式偵測發生到內部錯誤時，以 SIGABRT 信號中止。
Comment[zu]=Umyaleli wekhompyutha unqamuka ngophawu lwe-SIGABRT uma ecosha ukungahambisani kwangaphakathi okubangwe igciwane elisohlelweni lwemisebenzi.

2
kate/ChangeLog
Unescape Escape View File

@ -279,7 +279,7 @@
* kateconsole.* konsole/* : add kateconsole widget
2001-02-16 Anders Lund <anders@alweb.dk>
* katemainwindow.cpp :fixing read/write options to use maindockwindow functions.
* katemainwindow.cpp :fixing read/write options to use maindoctwindow functions.
2001-02-15 Joseph Wenninger <jowenn@kde.org>
* kateview.cpp : Tab doesn't jump to next widget anymore, but inserts a tab into the text

2
kate/app/kateapp.cpp
Unescape Escape View File

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

2
kate/app/kateconfigdialog.cpp
Unescape Escape View File

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

2
kate/app/katedocmanager.cpp
Unescape Escape View File

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

2
kcontrol/access/kaccess.cpp
Unescape Escape View File

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

2
kcontrol/access/kaccess.h
Unescape Escape View File

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

2
kcontrol/background/bgadvanced.cpp
Unescape Escape View File

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

16
kcontrol/background/bgdialog.cpp
Unescape Escape View File

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

4
kcontrol/colors/widgetcanvas.cpp
Unescape Escape View File

@ -356,7 +356,7 @@ void WidgetCanvas::drawSampleWidgets()
KPixmap pmTitle;
pmTitle.resize( width()-160, 20 );
// Switched to vertical gradient because those kwin styles that
// Switched to vertical gradient because those twin styles that
// use the gradient have it vertical.
KPixmapEffect::gradient(pmTitle, iaTitle, iaBlend,
KPixmapEffect::HorizontalGradient);
@ -400,7 +400,7 @@ void WidgetCanvas::drawSampleWidgets()
paint.setBrush( aTitle );paint.setPen( aTitle );
paint.drawRect( 65, 30+5, width()-152, 20 );
// Switched to vertical gradient because those kwin styles that
// Switched to vertical gradient because those twin styles that
// use the gradient have it vertical.
pmTitle.resize( width()-152, 20 );
KPixmapEffect::gradient(pmTitle, aTitle, aBlend,

2
kcontrol/kcontrol/toplevel.cpp
Unescape Escape View File

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

6
kcontrol/keys/keyconfig.cpp
Unescape Escape View File

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

4
kcontrol/keys/main.cpp
Unescape Escape View File

@ -132,7 +132,7 @@ extern "C"
KDE_EXPORT KCModule *create_keys(TQWidget *parent, const char * /*name*/)
{
// What does this do? Why not insert klipper and kxkb, too? --ellis, 2002/01/15
KGlobal::locale()->insertCatalogue("kwin");
KGlobal::locale()->insertCatalogue("twin");
KGlobal::locale()->insertCatalogue("kdesktop");
KGlobal::locale()->insertCatalogue("kicker");
return new KeyModule(parent, "kcmkeys");
@ -168,7 +168,7 @@ extern "C"
#define CTRL Qt::CTRL
#define ALT Qt::ALT
#include "../../klipper/klipperbindings.cpp"
#include "../../kwin/kwinbindings.cpp"
#include "../../twin/twinbindings.cpp"
#define KICKER_ALL_BINDINGS
#include "../../kicker/kicker/core/kickerbindings.cpp"
#include "../../kicker/taskbar/taskbarbindings.cpp"

2
kcontrol/keys/shortcuts.cpp
Unescape Escape View File

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

2
kcontrol/kicker/positiontab_impl.cpp
Unescape Escape View File

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

16
kcontrol/konq/desktop.cpp
Unescape Escape View File

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

2
kcontrol/konq/desktop.h
Unescape Escape View File

@ -27,7 +27,7 @@ class TQCheckBox;
class KLineEdit;
class KIntNumInput;
// if you change this, update also the number of keyboard shortcuts in kwin/kwinbindings.cpp
// if you change this, update also the number of keyboard shortcuts in twin/twinbindings.cpp
static const int maxDesktops = 20;
class KDesktopConfig : public KCModule

2
kcontrol/konq/desktopbehavior.desktop
Unescape Escape View File

@ -212,7 +212,7 @@ Keywords[pl]=konqueror,menedżer plików,kfm,wskazówki,informacja o pliku,osobn
Keywords[pt]=konqueror,gestor de ficheiros,kfm,dicas,dicas de ficheiros,janela separada,comportamento,utilização de memória,URL de base,
Keywords[pt_BR]=konqueror,gerenciador de arquivos,kfm,dicas,arquivos de dicas,janelas separadas,janelas unidas,comportamento,comportamento,uso de memória,URL local,
Keywords[ro]=konqueror,manager de fișiere,kfm,sfaturi,ferestre separate,comportament,utilizare memorie,URL Acasă
Keywords[rw]=Konqueror,mugengadosiye,kfm,inyobora, inyobora y'idosiye, gutandukanya Idirishya,kurema amadirishya,imyitwarire,imyitwarire,ikoresha ry'umwanyabubiko,URL y'Ipaji kwinjira,
Keywords[rw]=Konqueror,mugengadosiye,kfm,inyobora, inyobora y'idosiye, gutandukanya Idirishya,kurema amadirishya,imyitwarire,imyitwarire,ikoresha ry'umwanyabubiko,URL y'Ipaji twinjira,
Keywords[se]=konqueror,fiilagieđahalli,kfm,rávvagat,fiilarávvagat,iežaš láse,ođđa láset,láhtten,muitugeavaheapmi,ruoktu-URL
Keywords[sk]=konqueror,správa súborov,kfm,tipy,oddelené okná,nové okná,správanie,využitie pamäti,domovské URL
Keywords[sl]=konqueror,upravitelj datotek,upravljalnik,kfm,namigi,namigi datotek,ločeno okno,ustvari okna,obnašanje,poraba pomnilnika,domači URL

2
kcontrol/konq/desktopbehavior_impl.cpp
Unescape Escape View File

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

2
kcontrol/konq/webbehavior.desktop
Unescape Escape View File

@ -212,7 +212,7 @@ Keywords[pl]=konqueror,menedżer plików,kfm,wskazówki,informacja o pliku,osobn
Keywords[pt]=konqueror,gestor de ficheiros,kfm,dicas,dicas de ficheiros,janela separada,comportamento,utilização de memória,URL de base,
Keywords[pt_BR]=konqueror,gerenciador de arquivos,kfm,dicas,arquivos de dicas,janelas separadas,janelas unidas,comportamento,comportamento,uso de memória,URL local,
Keywords[ro]=konqueror,manager de fișiere,kfm,sfaturi,ferestre separate,comportament,utilizare memorie,URL Acasă
Keywords[rw]=Konqueror,mugengadosiye,kfm,inyobora, inyobora y'idosiye, gutandukanya Idirishya,kurema amadirishya,imyitwarire,imyitwarire,ikoresha ry'umwanyabubiko,URL y'Ipaji kwinjira,
Keywords[rw]=Konqueror,mugengadosiye,kfm,inyobora, inyobora y'idosiye, gutandukanya Idirishya,kurema amadirishya,imyitwarire,imyitwarire,ikoresha ry'umwanyabubiko,URL y'Ipaji twinjira,
Keywords[se]=konqueror,fiilagieđahalli,kfm,rávvagat,fiilarávvagat,iežaš láse,ođđa láset,láhtten,muitugeavaheapmi,ruoktu-URL
Keywords[sk]=konqueror,správa súborov,kfm,tipy,oddelené okná,nové okná,správanie,využitie pamäti,domovské URL
Keywords[sl]=konqueror,upravitelj datotek,upravljalnik,kfm,namigi,namigi datotek,ločeno okno,ustvari okna,obnašanje,poraba pomnilnika,domači URL

2
kcontrol/krdb/krdb.cpp
Unescape Escape View File

@ -119,7 +119,7 @@ static void applyQtColors( KConfig& kglobals, TQSettings& settings, TQPalette& n
settings.writeEntry("/qt/Palette/inactive", inactcg);
settings.writeEntry("/qt/Palette/disabled", discg);
// export kwin's colors to qtrc for kstyle to use
// export twin's colors to qtrc for kstyle to use
kglobals.setGroup("WM");
// active colors

26
kcontrol/krdb/themes/HighContrastDark-big/HighContrastDark-big.xml
Unescape Escape View File

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

26
kcontrol/krdb/themes/HighContrastDark/HighContrastDark.xml
Unescape Escape View File

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

26
kcontrol/krdb/themes/HighContrastLight-big/HighContrastLight-big.xml
Unescape Escape View File

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

26
kcontrol/krdb/themes/HighContrastLight/HighContrastLight.xml
Unescape Escape View File

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

18
kcontrol/krdb/themes/KDE_Classic/KDE_Classic.xml
Unescape Escape View File

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

18
kcontrol/krdb/themes/Keramik/Keramik.xml
Unescape Escape View File

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

18
kcontrol/krdb/themes/Plastik/Plastik.xml
Unescape Escape View File

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

18
kcontrol/krdb/themes/Platinum/Platinum.xml
Unescape Escape View File

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

18
kcontrol/krdb/themes/Redmond/Redmond.xml
Unescape Escape View File

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

18
kcontrol/krdb/themes/Sunshine/Sunshine.xml
Unescape Escape View File

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

26
kcontrol/krdb/themes/YellowOnBlue-big/YellowOnBlue-big.xml
Unescape Escape View File

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

26
kcontrol/krdb/themes/YellowOnBlue/YellowOnBlue.xml
Unescape Escape View File

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

6
kcontrol/kthememanager/README
Unescape Escape View File

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

2
kcontrol/kthememanager/TODO
Unescape Escape View File

@ -1,5 +1,5 @@
- use KHotNewStuff for directly downloading themes from kde-look.org
- custom pixmap kwin themes (requires kwmtheme to be ported first)
- custom pixmap twin themes (requires kwmtheme to be ported first)
- write user and theme developer documentation
Handle:

74
kcontrol/kthememanager/ktheme.cpp
Unescape Escape View File

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

2
kcontrol/kthememanager/ktheme.h
Unescape Escape View File

@ -171,7 +171,7 @@ private:
/**
* Creates a list of "event" elements based on:
* @param events The list of events to work on
* @param object Specifier (currently "global" or "kwin")
* @param object Specifier (currently "global" or "twin")
* @param parent Parent element to append to
* @param cfg The KConfig object to work with
*/

2
kcontrol/randr/configdialog.cpp
Unescape Escape View File

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

2
kcontrol/randr/ktimerdialog.cpp
Unescape Escape View File

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

2
kcontrol/screensaver/kswidget.cpp
Unescape Escape View File

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

2
kcontrol/screensaver/testwin.cpp
Unescape Escape View File

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

2
kcontrol/style/kcmstyle.cpp
Unescape Escape View File

@ -649,7 +649,7 @@ void KCMStyle::save()
if (m_bEffectsDirty) {
KIPC::sendMessageAll(KIPC::SettingsChanged);
kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString(""));
kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
}
//update kicker to re-used tooltips kicker parameter otherwise, it overwritted
//by style tooltips parameters.

2
kcontrol/taskbar/kcmtaskbar.cpp
Unescape Escape View File

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

4
kcontrol/xinerama/kcmxinerama.cpp
Unescape Escape View File

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

8
kdesktop/bgmanager.cc
Unescape Escape View File

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

2
kdesktop/bgmanager.h
Unescape Escape View File

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

44
kdesktop/desktop.cc
Unescape Escape View File

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

4
kdesktop/desktop.h
Unescape Escape View File

@ -96,7 +96,7 @@ public:
void logout( KApplication::ShutdownConfirm confirm, KApplication::ShutdownType sdtype );
KWinModule* kwinModule() const { return m_pKwinmodule; }
KWinModule* twinModule() const { return m_pKwinmodule; }
// The action collection of the active widget
KActionCollection *actionCollection();
@ -153,7 +153,7 @@ private slots:
/** Connected to KDIconView and KRootWidget */
void slotSwitchDesktops(int delta);
// when there seems to be no kicker, we have to get desktopIconsArea from kwinModule
// when there seems to be no kicker, we have to get desktopIconsArea from twinModule
void slotNoKicker();
/** Used for desktop show/hide functionality */

2
kdesktop/init/Templates/linkURL.desktop
Unescape Escape View File

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

4
kdesktop/kdiconview.cc
Unescape Escape View File

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

12
kdesktop/krootwm.cc
Unescape Escape View File

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

4
kdesktop/lock/lockprocess.cc
Unescape Escape View File

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

6
kdesktop/main.cc
Unescape Escape View File

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

2
kdesktop/minicli.cpp
Unescape Escape View File

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

4
kdm/config.def
Unescape Escape View File

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

6
kdm/kfrontend/kdmshutdown.cpp
Unescape Escape View File

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

4
kdm/kfrontend/kfdialog.cpp
Unescape Escape View File

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

26
kdm/kfrontend/kgapp.cpp
Unescape Escape View File

@ -66,7 +66,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <pwd.h>
bool argb_visual_available = false;
bool has_kwin = false;
bool has_twin = false;
bool is_themed = false;
bool trinity_desktop_lock_use_sak = TRUE;
@ -190,7 +190,7 @@ kg_main( const char *argv0 )
KProcess *tsak = 0;
KProcess *proc = 0;
KProcess *comp = 0;
KProcess *kwin = 0;
KProcess *twin = 0;
trinity_desktop_lock_use_sak = _useSAK;
if (trinity_desktop_lock_use_sak) {
@ -310,10 +310,10 @@ kg_main( const char *argv0 )
}
if (!_windowManager.isEmpty()) {
kwin = new KProcess;
*kwin << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + _windowManager.ascii();
kwin->start();
has_kwin = true;
twin = new KProcess;
*twin << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + _windowManager.ascii();
twin->start();
has_twin = true;
}
GSendInt( G_Ready );
@ -361,14 +361,14 @@ kg_main( const char *argv0 )
// This also prevents the user from being dropped to a console login if Xorg glitches or is buggy
XSetErrorHandler( ignoreXError );
KThemedGreeter *tgrt;
bool has_kwin_bkp = has_kwin;
bool has_twin_bkp = has_twin;
is_themed = true;
has_kwin = false; // [FIXME] The themed greeter is built on the assumption that there is no window manager available (i.e. it keeps stealing focus) and needs to be repaired.
has_twin = false; // [FIXME] The themed greeter is built on the assumption that there is no window manager available (i.e. it keeps stealing focus) and needs to be repaired.
dialog = tgrt = new KThemedGreeter;
kdDebug() << timestamp() << " themed" << endl;
if (!tgrt->isOK()) {
is_themed = false;
has_kwin = has_kwin_bkp;
has_twin = has_twin_bkp;
delete tgrt;
checkSAK(app);
dialog = new KStdGreeter;
@ -450,10 +450,10 @@ kg_main( const char *argv0 )
comp->detach();
delete comp;
}
if (kwin) {
kwin->closeStdin();
kwin->detach();
delete kwin;
if (twin) {
twin->closeStdin();
twin->detach();
delete twin;
}
delete proc;
UnsecureDisplay( dpy );

2
khotkeys/shared/triggers.cpp
Unescape Escape View File

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

26
khotkeys/shared/windows.cpp
Unescape Escape View File

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

2
khotkeys/shared/windows.h
Unescape Escape View File

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

2
kicker/applets/clock/datepicker.cpp
Unescape Escape View File

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

4
kicker/applets/menu/menuapplet.cpp
Unescape Escape View File

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

86
kicker/applets/minipager/pagerapplet.cpp
Unescape Escape View File

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

6
kicker/applets/minipager/pagerapplet.h
Unescape Escape View File

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

18
kicker/applets/minipager/pagerbutton.cpp
Unescape Escape View File

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

4
kicker/applets/swallow/swallow.cpp
Unescape Escape View File

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

16
kicker/applets/systemtray/systemtrayapplet.cpp
Unescape Escape View File

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

2
kicker/applets/systemtray/systemtrayapplet.h
Unescape Escape View File

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

12
kicker/extensions/dockbar/dockbarextension.cpp
Unescape Escape View File

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

2
kicker/extensions/dockbar/dockbarextension.h
Unescape Escape View File

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

2
kicker/extensions/dockbar/dockcontainer.cpp
Unescape Escape View File

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

4
kicker/extensions/kasbar/ChangeLog
Unescape Escape View File

@ -384,7 +384,7 @@
2004-06-26 Saturday 00:28 rich
* - Fix test program for kwin changes.
* - Fix test program for twin changes.
2004-06-26 Saturday 00:10 rich
@ -698,7 +698,7 @@
2001-11-29 Thursday 19:23 rich
* Switch to taskmanager task popup menu instead of kwin (avoids
* Switch to taskmanager task popup menu instead of twin (avoids
some problems)
2001-11-25 Sunday 02:03 rich

2
kicker/extensions/kasbar/kasbarapp.cpp
Unescape Escape View File

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

2
kicker/extensions/kasbar/kasclockitem.cpp
Unescape Escape View File

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

2
kicker/extensions/kasbar/kasgroupitem.cpp
Unescape Escape View File

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

2
kicker/extensions/kasbar/kasloaditem.cpp
Unescape Escape View File

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

2
kicker/extensions/kasbar/kasstartupitem.cpp
Unescape Escape View File

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

2
kicker/kicker/buttons/windowlistbutton.cpp
Unescape Escape View File

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

2
kicker/kicker/core/container_applet.h
Unescape Escape View File

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

8
kicker/kicker/core/container_extension.cpp
Unescape Escape View File

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

8
kicker/kicker/core/extensionmanager.cpp
Unescape Escape View File

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

14
kicker/kicker/core/kicker.cpp
Unescape Escape View File

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

4
kicker/kicker/core/kicker.h
Unescape Escape View File

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

32
kicker/kicker/core/showdesktop.cpp
Unescape Escape View File

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

2
kicker/kicker/ui/itemview.cpp
Unescape Escape View File

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

2
kicker/kicker/ui/k_mnu.cpp
Unescape Escape View File

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

2
kicker/kicker/ui/k_new_mnu.cpp
Unescape Escape View File

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

2
kicker/proxy/appletproxy.cpp
Unescape Escape View File

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

2
kicker/taskbar/taskbarcontainer.cpp
Unescape Escape View File

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

2
kicker/taskbar/taskcontainer.cpp
Unescape Escape View File

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

2
kicker/taskmanager/taskmanager.cpp
Unescape Escape View File

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

2
kicker/taskmanager/taskmanager.h
Unescape Escape View File

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

2
klipper/configdialog.cpp
Unescape Escape View File

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

2
klipper/klipperpopup.cpp
Unescape Escape View File

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

2
klipper/main.cpp
Unescape Escape View File

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

2
klipper/toplevel.cpp
Unescape Escape View File

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

2
konqueror/KonqMainWindowIface.cc
Unescape Escape View File

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

2
konqueror/client/kfmclient.cc
Unescape Escape View File

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

2
konqueror/keditbookmarks/main.cpp
Unescape Escape View File

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

4
konqueror/konq_mainwindow.cc
Unescape Escape View File

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

2
konqueror/konq_misc.cc
Unescape Escape View File

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

2
konqueror/sidebar/trees/init/remote/web/kde_web.desktop
Unescape Escape View File

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

2
konsole/konsole/konsole.cpp
Unescape Escape View File

@ -40,7 +40,7 @@
/*STATE:
konsole/kwin session management, parts stuff, config, menues
konsole/twin session management, parts stuff, config, menues
are all in bad need for a complete rewrite.
While the emulation core (TEmulation, TEVt102, TEScreen, TEWidget)

2
konsole/konsole/konsole.h
Unescape Escape View File

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

18
kpager/desktop.cpp
Unescape Escape View File

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

2
kpager/desktop.h
Unescape Escape View File

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

8
kpager/kpager.cpp
Unescape Escape View File

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

4
kpager/kpager.h
Unescape Escape View File

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

2
kpersonalizer/README
Unescape Escape View File

@ -105,7 +105,7 @@ MacOS:
- Mac- Keyboard-Scheme
- use 2 clipboards for c&p (keyboard/mouse) (default)
- Window-Behavior -> Focus on click
- Titlebar doubleclick -> Shade (for now. MacOS X has Minimize but this isn't offered by kwin yet)
- Titlebar doubleclick -> Shade (for now. MacOS X has Minimize but this isn't offered by twin yet)
- Menubar on top
- WindowList-menu on MMB
- Walk trough windows mode: KDE

234
kpersonalizer/keyecandypage.cpp
Unescape Escape View File

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

4
kpersonalizer/keyecandypage.h
Unescape Escape View File

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

6
kpersonalizer/kospage.cpp
Unescape Escape View File

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

90
kpersonalizer/kstylepage.cpp
Unescape Escape View File

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

8
kpersonalizer/kstylepage.h
Unescape Escape View File

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

8
krootbacking/krootbacking.cpp
Unescape Escape View File

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

4
ksmserver/README
Unescape Escape View File

@ -28,11 +28,11 @@ The server is usually started from the 'startkde' script. It supports the follow
-r, --restore Restores the previous session if available
-w, --windowmanager <wm> Starts 'wm' in case no other window manager is
participating in the session. Default is 'kwin'
participating in the session. Default is 'twin'
The default 'startkde' launches 'ksmserver --restore'. The
'windowmanager' option is useful for users that prefer a window
manager other than kwin. Since the window manager has to participate
manager other than twin. Since the window manager has to participate
in the session (it has to remember window positions and states), it is
usually restarted when the session is restored. To be *really* sure
that this happens, even if the wm might have crashed during the

4
ksmserver/legacy.cpp
Unescape Escape View File

@ -50,7 +50,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <kconfig.h>
#include <kdebug.h>
#include <kwinmodule.h>
#include <twinmodule.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@ -239,7 +239,7 @@ void KSMServer::restoreLegacySession( KConfig* config )
if( config->hasGroup( "Legacy" + sessionGroup )) {
KConfigGroupSaver saver( config, "Legacy" + sessionGroup );
restoreLegacySessionInternal( config );
} else if( wm == "kwin" ) { // backwards comp. - get it from kwinrc
} else if( wm == "twin" ) { // backwards comp. - get it from twinrc
KConfigGroupSaver saver( config, sessionGroup );
int count = config->readNumEntry( "count", 0 );
for ( int i = 1; i <= count; i++ ) {

4
ksmserver/main.cpp
Unescape Escape View File

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

4
ksmserver/server.cpp
Unescape Escape View File

@ -911,9 +911,9 @@ bool KSMServer::isWM( const TQString& program ) const
{
// KWin relies on ksmserver's special treatment in phase1,
// therefore make sure it's recognized even if ksmserver
// was initially started with different WM, and kwin replaced
// was initially started with different WM, and twin replaced
// it later
return ((program == wm) || (program == "kwin"));
return ((program == wm) || (program == "twin"));
}
bool KSMServer::isCM( const KSMClient* client ) const

2
ksmserver/shutdowndlg.cpp
Unescape Escape View File

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

2
ksmserver/startup.cpp
Unescape Escape View File

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

2
ksmserver/startupdlg.cpp
Unescape Escape View File

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

2
ksplashml/themeengine/standard/wndicon.cpp
Unescape Escape View File

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

2
ksplashml/themeengine/standard/wndstatus.cpp
Unescape Escape View File

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

2
ksplashml/themeengine/themeengine.cpp
Unescape Escape View File

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

2
ksplashml/wndmain.cpp
Unescape Escape View File

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

18
kstart/kstart.cpp
Unescape Escape View File

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

4
ksysguard/gui/ksysguard.cc
Unescape Escape View File

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

2
ksysguard/gui/ksysguard.h
Unescape Escape View File

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

14
ksystraycmd/ksystraycmd.cpp
Unescape Escape View File

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

4
ksystraycmd/ksystraycmd.h
Unescape Escape View File

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

2
ktip/ktipwindow.cpp
Unescape Escape View File

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

14
kwin/CMakeLists.txt
Unescape Escape View File

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

6
kwin/COMPLIANCE
Unescape Escape View File

@ -11,8 +11,8 @@ Listed below are all the NetWM (or EWM) hints decided upon on freedesktop.org
compliance with the spec. Some parts also involve the pager and clients which
this document will cater for as well where applicable.
If you modify the level of NetWM compliance (via modification of kwin/*,
tdecore/netwm.* or tdecore/kwin.* etc.), or notice any new hints that
If you modify the level of NetWM compliance (via modification of twin/*,
tdecore/netwm.* or tdecore/twin.* etc.), or notice any new hints that
were added after version 1.2, please modify this document appropriately.
Properties are ordered in the table in the order they are found in the
specification. To list any important notes regarding a property, just
@ -26,7 +26,7 @@ _NET_NUMBER_OF_DESKTOPS root window property done
+----------------------------------------------------------------+
If you have any questions regarding the specification, feel free to ask on the KWin
mailing list <kwin@kde.org>, or on the Window Manager Spec list <wm-spec-list@gnome.org>.
mailing list <twin@kde.org>, or on the Window Manager Spec list <wm-spec-list@gnome.org>.
-- Karol <kszwed@kde.org>
(

22
kwin/CONFIGURING
Unescape Escape View File

@ -36,35 +36,35 @@ To create such window-specific setting automatically without a need of doing
it manually for every user (for example when doing a large deployment), follow
these steps:
- Back up your $KDEHOME/share/config/kwinrulesrc ($KDEHOME usually being $HOME/.kde)
- Back up your $KDEHOME/share/config/twinrulesrc ($KDEHOME usually being $HOME/.kde)
and remove it
- Run 'dcop kwin default reconfigure'
- Run 'dcop twin default reconfigure'
- Create manually all window-specific settings that should be included (see above)
- When done, check in Window-specific settings configuration module
(Alt+F3/Configure window behavior/Window-specific settings) that all rules are
included
- Create a copy of $KDEHOME/share/config/kwinrulesrc and restore the original one
- Rename the copy (i.e. the newly created kwinrulesrc) to have its unique name
- Create a copy of $KDEHOME/share/config/twinrulesrc and restore the original one
- Rename the copy (i.e. the newly created twinrulesrc) to have its unique name
(e.g. foobar_fix_maxsize in this example case)
- Be careful with manual modifications of the file, especially make sure the count=
field in the [General] group is updated if needed
- Create a file for kconfig_update like this (named kwin_foobar_fix_maxsize.upd
- Create a file for kconfig_update like this (named twin_foobar_fix_maxsize.upd
in this example):
# kwin_foobar_fix_maxsize.upd start #
# twin_foobar_fix_maxsize.upd start #
Id=foobar_fix_maxsize
File=kwinrules_update
File=twinrules_update
Group=Dummy
Options=overwrite
ScriptArguments=foobar_fix_maxsize
Script=kwin_update_default_rules
Script=twin_update_default_rules
# kwin_foobar_fix_maxsize.upd end #
# twin_foobar_fix_maxsize.upd end #
- The kconfig_file (kwin_foobar_fix_maxsize.upd) is to be placed
- The kconfig_file (twin_foobar_fix_maxsize.upd) is to be placed
in $KDEDIR/share/apps/kconf_update/
- The file with the window-specific settings (foobar_fix_maxsize) is to be placed
in $KDEDIR/share/apps/kwin/default_rules/
in $KDEDIR/share/apps/twin/default_rules/
All KDE user accounts should have these new window-specific settings added

30
kwin/HACKING
Unescape Escape View File

@ -1,12 +1,12 @@
Mailing list and bugzilla:
==========================
The KWin mailing list is kwin@kde.org . It's rather low traffic.
The KWin mailing list is twin@kde.org . It's rather low traffic.
The bugs.kde.org product for KWin is 'kwin'. Currently the components are 'general' (KWin core),
The bugs.kde.org product for KWin is 'twin'. Currently the components are 'general' (KWin core),
'decorations' (decoration plugins), 'compatibility' (problems with non-KDE WMs/apps) and
'eyecandy' (transparency and similar effects).
There are also two kcontrol components 'kcmkwindecoration' and 'kcmkwinoptions' related
There are also two kcontrol components 'kcmtwindecoration' and 'kcmtwinoptions' related
to KWin's KControl modules.
@ -14,20 +14,20 @@ KWin parts:
===========
There are four parts of KWin:
- The KWin core, located in kdebase/kwin/*, which implements the actual functionality.
- The decoration plugins, located in kdebase/kwin/clients and kdeartwork/kwin-styles, which
- The KWin core, located in kdebase/twin/*, which implements the actual functionality.
- The decoration plugins, located in kdebase/twin/clients and kdeartwork/twin-styles, which
are responsible for the visual representation of the windows.
- The libkdecoration library, located in kdebase/kwin/lib/*, which is used for communication
- The libkdecoration library, located in kdebase/twin/lib/*, which is used for communication
between the core and the decoration, and also implements some shared functionality
for the decorations.
- KControl modules, located in kdebase/kwin/kcmkwin.
- KControl modules, located in kdebase/twin/kcmtwin.
KWin decorations:
=================
If you want to develop a decoration plugin for KWin, a HOWTO is available at
http://www.usermode.org/docs/kwintheme.html . It is currently not possible to create
http://www.usermode.org/docs/twintheme.html . It is currently not possible to create
a new decoration without knowledge of C++, but it should be possible to write a themeable
decoration (I'm not aware of any such decoration though).
@ -36,7 +36,7 @@ Restarting KWin:
================
Since KWin takes care of focus handling, first killing KWin and then launching new instance
can cause focus trouble. Therefore it's possible to run 'kwin --replace', which will start
can cause focus trouble. Therefore it's possible to run 'twin --replace', which will start
new KWin instance and tell the old one to quit.
@ -46,7 +46,7 @@ Handling the case when KWin crashes:
Again, without KWin running there may be focus problems. The simplest way to solve them
is to add the 'Run Command' applet to Kicker - it can receive focus even without KWin running.
If you can't add the applet or can reach it for some reason, switch to text console, and run
'DISPLAY=:0 kwin --replace' (and then you can run 'kwin --replace' again from X).
'DISPLAY=:0 twin --replace' (and then you can run 'twin --replace' again from X).
If KWin is temporarily unusable because of some change and e.g. crashes during startup, it
is possible to run another window manager, for example Metacity, OpenBox or FVWM (the command
@ -58,7 +58,7 @@ Debugging KWin:
Focus problems once more. It is not possible to debug KWin in gdb in the X session that KWin is managing,
because that'd block focus and window operations. It is necessary to switch to a text console
and attach to the running KWin instance from there, or launch it as 'DISPLAY=:0 gdb kwin'.
and attach to the running KWin instance from there, or launch it as 'DISPLAY=:0 gdb twin'.
Since KWin is such an important component of KDE, it is usually better to start another X for development.
Note that XNest is quite buggy and is therefore not recommended to use.
@ -101,7 +101,7 @@ The rest of the files contain additional helper classes:
- group.* - grouping related windows together (warning! This is currently really messy and scary code
that should be rewritten).
- killwindow.* - handling of the Ctrl+Esc feature
- kwinbindings.cpp - KWin's keyboard shortcuts (used by kdebase/kcontrol/keys)
- twinbindings.cpp - KWin's keyboard shortcuts (used by kdebase/kcontrol/keys)
- notifications.* - for KNotify
- options.* - all configuration options for KWin are stored in this class
- plugins.* - loading of the right decoration plugin
@ -123,7 +123,7 @@ code is wrapped in helper functions, and I can handle problems there ;) . Howeve
features don't require touching X/Xlib directly, still X/Xlib may impose their semantics on the way
things are done. When in doubt, simply ask.
All patches for KWin core should be sent to kwin@kde.org for review first. Even seemingly harmless
All patches for KWin core should be sent to twin@kde.org for review first. Even seemingly harmless
changes may have extensive consequences.
Various notes:
@ -133,7 +133,7 @@ in class Client and it will print information about the window.
- KWin itself cannot create any normal windows, because it would have trouble managing its own windows.
For such cases (which should be rare) a small external helper application is needed (kdialog should often
do, and for special cases such a utility needs to be written like kwin/killer).
do, and for special cases such a utility needs to be written like twin/killer).
X documentation:
@ -171,4 +171,4 @@ right before sending the patch). I don't care where you do and don't put spaces
variables, as long as I can read it (trying to make it look like the rest of the code is bonus points though ;) ).
kwin@kde.org
twin@kde.org

20
kwin/Makefile.am
Unescape Escape View File

@ -4,35 +4,35 @@ if include_kompmgr
KOMPMGR=kompmgr
endif
SUBDIRS = lib . killer kcmkwin pics clients oldheaders data $(KOMPMGR)
SUBDIRS = lib . killer kcmtwin pics clients oldheaders data $(KOMPMGR)
bin_PROGRAMS =
lib_LTLIBRARIES =
tdeinit_LTLIBRARIES = kwin.la
tdeinit_LTLIBRARIES = twin.la
kwin_la_SOURCES = workspace.cpp client.cpp placement.cpp atoms.cpp \
twin_la_SOURCES = workspace.cpp client.cpp placement.cpp atoms.cpp \
utils.cpp layers.cpp main.cpp popupinfo.cpp tabbox.cpp \
options.cpp plugins.cpp events.cpp KWinInterface.skel \
killwindow.cpp geometrytip.cpp sm.cpp group.cpp bridge.cpp \
manage.cpp notifications.cpp activation.cpp useractions.cpp \
geometry.cpp rules.cpp
kwin_la_LIBADD = $(LIB_TDEUI) lib/libtdecorations.la
kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version
twin_la_LIBADD = $(LIB_TDEUI) lib/libtdecorations.la
twin_la_LDFLAGS = $(all_libraries) -module -avoid-version
include_HEADERS = KWinInterface.h
KDE_ICON = kwin
KDE_ICON = twin
METASOURCES = AUTO
messages: rc.cpp
$(XGETTEXT) -kaliasLocal *.h *.cpp killer/*.cpp lib/*.cpp -o $(podir)/kwin.pot
$(XGETTEXT) -kaliasLocal *.h *.cpp killer/*.cpp lib/*.cpp -o $(podir)/twin.pot
kwin_datadir = $(kde_datadir)/kwin
twin_datadir = $(kde_datadir)/twin
kwin_data_DATA= eventsrc
twin_data_DATA= eventsrc
kde_kcfg_DATA = kwin.kcfg
kde_kcfg_DATA = twin.kcfg
include ../admin/Doxyfile.am

4
kwin/README
Unescape Escape View File

@ -1,4 +1,4 @@
- The mailing list for KWin is kwin@kde.org (https://mail.kde.org/mailman/listinfo/kwin).
- The mailing list for KWin is twin@kde.org (https://mail.kde.org/mailman/listinfo/twin).
- If you want to develop KWin, see file HACKING.
@ -23,7 +23,7 @@ background knowledge (since sometimes it's difficult even for people who
do have the knowledge), the mechanisms are first briefly explained, and
then an example of fixing the various problems is given.
For comments, questions, suggestions and whatever use the kwin@kde.org
For comments, questions, suggestions and whatever use the twin@kde.org
mailing list.

4
kwin/activation.cpp
Unescape Escape View File

@ -609,7 +609,7 @@ bool Workspace::allowFullClientRaising( const Client* c, Time time )
void Workspace::restoreFocus()
{
// this updateXTime() is necessary - as FocusIn events don't have
// a timestamp *sigh*, kwin's timestamp would be older than the timestamp
// a timestamp *sigh*, twin's timestamp would be older than the timestamp
// that was used by whoever caused the focus change, and therefore
// the attempt to restore the focus would fail due to old timestamp
updateXTime();
@ -663,7 +663,7 @@ void Workspace::unfakeActivity( Client* c )
/*!
Updates the user time (time of last action in the active window).
This is called inside kwin for every action with the window
This is called inside twin for every action with the window
that qualifies for user interaction (clicking on it, activate it
externally, etc.).
*/

2
kwin/atoms.cpp
Unescape Escape View File

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

2
kwin/atoms.h
Unescape Escape View File

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

6
kwin/client.cpp
Unescape Escape View File

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

2
kwin/clients/Makefile.am
Unescape Escape View File

@ -4,5 +4,5 @@ SUBDIRS = plastik b2 default keramik laptop modernsystem quartz redmond web
messages: rc.cpp
$(EXTRACTRC) `find . -name \*.ui` >> rc.cpp
$(XGETTEXT) `find . -name \*.cpp` -o $(podir)/kwin_clients.pot
$(XGETTEXT) `find . -name \*.cpp` -o $(podir)/twin_clients.pot
-rm rc.cpp

10
kwin/clients/PORTING
Unescape Escape View File

@ -2,16 +2,16 @@ It's suggested you check sources of some KDE CVS decoration if in doubts or in n
Also, the API is documented in the .h header files.
Makefile.am:
- Change kwin_ to kwin3_ (in LDFLAGS, LIBADD, kde_module_LTLIBRARIES, SOURCES).
- Change twin_ to twin3_ (in LDFLAGS, LIBADD, kde_module_LTLIBRARIES, SOURCES).
- Make sure LDFLAGS contains $(KDE_PLUGIN) and -module .
- Add -ltdecorations to LIBADD.
- Do NOT rename the directory where the .desktop file is installed ( $(kde_datadir)/kwin/ ).
- Do NOT rename the directory where the .desktop file is installed ( $(kde_datadir)/twin/ ).
.desktop file:
- Change kwin_ to kwin3_ in X-KDE-Library.
- Change twin_ to twin3_ in X-KDE-Library.
Sources:
- There are no kwin/something.h includes, and don't use the KWinInternal namespace.
- There are no twin/something.h includes, and don't use the KWinInternal namespace.
- Use QToolTip instead of KWinToolTip.
- Use QButton instead of KWinButton, QToolButton instead of KWinToolButton and QWidget
instead of KWinWidgetButton.
@ -154,6 +154,6 @@ extern "C"
- Review mousePosition() if it's implemented. Position constants need 'Position' prepended,
e.g. Top -> PositionTop.
- Note that you cannot use "appdata" with KStandardDirs, as the decoration will be used
also in other applications than kwin.
also in other applications than twin.
- Implement all missing pure virtual functions. For mousePosition(), you may call
KDecoration::mousePosition() if it's sufficient.

8
kwin/clients/b2/CMakeLists.txt
Unescape Escape View File

@ -13,7 +13,7 @@ add_subdirectory( config )
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/kwin/lib
${CMAKE_SOURCE_DIR}/twin/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
@ -25,12 +25,12 @@ link_directories(
##### other data ################################
install( FILES b2.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
install( FILES b2.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
##### kwin3_b2 (module) #########################
##### twin3_b2 (module) #########################
tde_add_kpart( kwin3_b2 AUTOMOC
tde_add_kpart( twin3_b2 AUTOMOC
SOURCES b2client.cpp
LINK tdecorations-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

12
kwin/clients/b2/Makefile.am
Unescape Escape View File

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

2
kwin/clients/b2/b2.desktop
Unescape Escape View File

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

4
kwin/clients/b2/b2client.cpp
Unescape Escape View File

@ -103,7 +103,7 @@ static void read_config(B2ClientFactory *f)
buttonSize = (TQFontMetrics(options()->font(true)).height() + 1) & 0x3e;
if (buttonSize < 16) buttonSize = 16;
KConfig conf("kwinb2rc");
KConfig conf("twinb2rc");
conf.setGroup("General");
colored_frame = conf.readBoolEntry("UseTitleBarBorderColors", false);
do_draw_handle = conf.readBoolEntry("DrawGrabHandle", true);
@ -167,7 +167,7 @@ static void drawB2Rect(KPixmap *pix, const TQColor &primary, bool down)
}
TQPixmap* kwin_get_menu_pix_hack()
TQPixmap* twin_get_menu_pix_hack()
{
//return menu_pix; FIXME
return PIXMAP_A(P_MENU);

4
kwin/clients/b2/config/CMakeLists.txt
Unescape Escape View File

@ -20,9 +20,9 @@ link_directories(
)
##### kwin_b2_config (module) ###################
##### twin_b2_config (module) ###################
tde_add_kpart( kwin_b2_config AUTOMOC
tde_add_kpart( twin_b2_config AUTOMOC
SOURCES config.cpp
LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

10
kwin/clients/b2/config/Makefile.am
Unescape Escape View File

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

16
kwin/clients/b2/config/config.cpp
Unescape Escape View File

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

6
kwin/clients/default/CMakeLists.txt
Unescape Escape View File

@ -13,7 +13,7 @@ add_subdirectory( config )
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/kwin/lib
${CMAKE_SOURCE_DIR}/twin/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
@ -23,9 +23,9 @@ link_directories(
)
##### kwin3_default (module) ####################
##### twin3_default (module) ####################
tde_add_kpart( kwin3_default AUTOMOC
tde_add_kpart( twin3_default AUTOMOC
SOURCES kdedefault.cpp
LINK tdecorations-shared tdecore-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

8
kwin/clients/default/Makefile.am
Unescape Escape View File

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

4
kwin/clients/default/config/CMakeLists.txt
Unescape Escape View File

@ -20,9 +20,9 @@ link_directories(
)
##### kwin_default_config (module) ##############
##### twin_default_config (module) ##############
tde_add_kpart( kwin_default_config AUTOMOC
tde_add_kpart( twin_default_config AUTOMOC
SOURCES config.cpp
LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

10
kwin/clients/default/config/Makefile.am
Unescape Escape View File

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

16
kwin/clients/default/config/config.cpp
Unescape Escape View File

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

8
kwin/clients/keramik/CMakeLists.txt
Unescape Escape View File

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

14
kwin/clients/keramik/Makefile.am
Unescape Escape View File

@ -10,18 +10,18 @@ embedtool_SOURCES = embedtool.cpp
embedtool_LDADD = $(LIB_QT)
embedtool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kde_module_LTLIBRARIES = kwin3_keramik.la
kde_module_LTLIBRARIES = twin3_keramik.la
kwin3_keramik_la_SOURCES = keramik.cpp
kwin3_keramik_la_COMPILE_FIRST = tiles.h
kwin3_keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin3_keramik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
#kwin3_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
twin3_keramik_la_SOURCES = keramik.cpp
twin3_keramik_la_COMPILE_FIRST = tiles.h
twin3_keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin3_keramik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
#twin3_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
METASOURCES = AUTO
noinst_headers = keramik.h tiles.h
lnkdir = $(kde_datadir)/kwin
lnkdir = $(kde_datadir)/twin
lnk_DATA = keramik.desktop
EXTRA_DIST = $(lnk_DATA)

4
kwin/clients/keramik/config/CMakeLists.txt
Unescape Escape View File

@ -20,9 +20,9 @@ link_directories(
)
##### kwin_keramik_config (module) ##############
##### twin_keramik_config (module) ##############
tde_add_kpart( kwin_keramik_config AUTOMOC
tde_add_kpart( twin_keramik_config AUTOMOC
SOURCES config.cpp keramikconfig.ui
LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

10
kwin/clients/keramik/config/Makefile.am
Unescape Escape View File

@ -1,13 +1,13 @@
INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = kwin_keramik_config.la
kde_module_LTLIBRARIES = twin_keramik_config.la
kwin_keramik_config_la_SOURCES = config.cpp keramikconfig.ui
kwin_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin_keramik_config_la_LIBADD = $(LIB_TDEUI)
twin_keramik_config_la_SOURCES = config.cpp keramikconfig.ui
twin_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin_keramik_config_la_LIBADD = $(LIB_TDEUI)
METASOURCES = AUTO
noinst_HEADERS = config.h keramikconfig.h
lnkdir = $(kde_datadir)/kwin
lnkdir = $(kde_datadir)/twin

14
kwin/clients/keramik/config/config.cpp
Unescape Escape View File

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

2
kwin/clients/keramik/keramik.cpp
Unescape Escape View File

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

2
kwin/clients/keramik/keramik.desktop
Unescape Escape View File

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

10
kwin/clients/kwmtheme/Makefile.am
Unescape Escape View File

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

4
kwin/clients/kwmtheme/cli_installer/main.cpp
Unescape Escape View File

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

2
kwin/clients/kwmtheme/kwmtheme.desktop
Unescape Escape View File

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

32
kwin/clients/kwmtheme/kwmthemeclient.cpp
Unescape Escape View File

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

8
kwin/clients/laptop/CMakeLists.txt
Unescape Escape View File

@ -11,7 +11,7 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/kwin/lib
${CMAKE_SOURCE_DIR}/twin/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
@ -23,12 +23,12 @@ link_directories(
##### other data ################################
install( FILES laptop.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
install( FILES laptop.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
##### kwin3_laptop (module) #####################
##### twin3_laptop (module) #####################
tde_add_kpart( kwin3_laptop AUTOMOC
tde_add_kpart( twin3_laptop AUTOMOC
SOURCES laptopclient.cpp
LINK tdecorations-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

10
kwin/clients/laptop/Makefile.am
Unescape Escape View File

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

2
kwin/clients/laptop/laptop.desktop
Unescape Escape View File

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

8
kwin/clients/modernsystem/CMakeLists.txt
Unescape Escape View File

@ -12,7 +12,7 @@
add_subdirectory( config )
include_directories(
${CMAKE_SOURCE_DIR}/kwin/lib
${CMAKE_SOURCE_DIR}/twin/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
@ -24,12 +24,12 @@ link_directories(
##### other data ################################
install( FILES modernsystem.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
install( FILES modernsystem.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
##### kwin3_modernsys (module) ##################
##### twin3_modernsys (module) ##################
tde_add_kpart( kwin3_modernsys
tde_add_kpart( twin3_modernsys
SOURCES modernsys.cpp
LINK tdecorations-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

10
kwin/clients/modernsystem/Makefile.am
Unescape Escape View File

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

4
kwin/clients/modernsystem/config/CMakeLists.txt
Unescape Escape View File

@ -20,9 +20,9 @@ link_directories(
)
##### kwin_modernsys_config (module) ############
##### twin_modernsys_config (module) ############
tde_add_kpart( kwin_modernsys_config AUTOMOC
tde_add_kpart( twin_modernsys_config AUTOMOC
SOURCES config.cpp
LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

10
kwin/clients/modernsystem/config/Makefile.am
Unescape Escape View File

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

8
kwin/clients/modernsystem/config/config.cpp
Unescape Escape View File

@ -19,16 +19,16 @@ extern "C"
}
// 'conf' is a pointer to the kwindecoration modules open kwin config,
// 'conf' is a pointer to the twindecoration modules open twin config,
// and is by default set to the "Style" group.
//
// 'parent' is the parent of the TQObject, which is a VBox inside the
// Configure tab in kwindecoration
// Configure tab in twindecoration
ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(parent)
{
clientrc = new KConfig("kwinmodernsysrc");
KGlobal::locale()->insertCatalogue("kwin_clients");
clientrc = new KConfig("twinmodernsysrc");
KGlobal::locale()->insertCatalogue("twin_clients");
mainw = new TQWidget(parent);
vbox = new TQVBoxLayout(mainw);
vbox->setSpacing(6);

2
kwin/clients/modernsystem/modernsys.cpp
Unescape Escape View File

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

2
kwin/clients/modernsystem/modernsystem.desktop
Unescape Escape View File

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

8
kwin/clients/plastik/CMakeLists.txt
Unescape Escape View File

@ -15,7 +15,7 @@ add_definitions( -DQT_PLUGIN )
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/kwin/lib
${CMAKE_SOURCE_DIR}/twin/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
@ -27,12 +27,12 @@ link_directories(
##### other data ################################
install( FILES plastik.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
install( FILES plastik.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
##### kwin3_plastik (module) ####################
##### twin3_plastik (module) ####################
tde_add_kpart( kwin3_plastik AUTOMOC
tde_add_kpart( twin3_plastik AUTOMOC
SOURCES plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp
LINK tdecorations-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

16
kwin/clients/plastik/Makefile.am
Unescape Escape View File

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

4
kwin/clients/plastik/config/CMakeLists.txt
Unescape Escape View File

@ -24,9 +24,9 @@ link_directories(
install( FILES DESTINATION ${XDG_APPS_INSTALL_DIR} )
##### kwin_plastik_config (module) ##############
##### twin_plastik_config (module) ##############
tde_add_kpart( kwin_plastik_config AUTOMOC
tde_add_kpart( twin_plastik_config AUTOMOC
SOURCES config.cpp configdialog.ui
LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

10
kwin/clients/plastik/config/Makefile.am
Unescape Escape View File

@ -1,14 +1,14 @@
INCLUDES = $(all_includes)
kde_module_LTLIBRARIES = kwin_plastik_config.la
kde_module_LTLIBRARIES = twin_plastik_config.la
kwin_plastik_config_la_SOURCES = config.cpp configdialog.ui
kwin_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin_plastik_config_la_LIBADD = $(LIB_TDEUI)
twin_plastik_config_la_SOURCES = config.cpp configdialog.ui
twin_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin_plastik_config_la_LIBADD = $(LIB_TDEUI)
METASOURCES = AUTO
noinst_HEADERS = config.h
DISTCLEANFILES = $(METASOURCES)
lnkdir = $(kde_datadir)/kwin
lnkdir = $(kde_datadir)/twin

4
kwin/clients/plastik/config/config.cpp
Unescape Escape View File

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

2
kwin/clients/plastik/plastik.cpp
Unescape Escape View File

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

2
kwin/clients/plastik/plastik.desktop
Unescape Escape View File

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

2
kwin/clients/plastik/plastikbutton.cpp
Unescape Escape View File

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

8
kwin/clients/quartz/CMakeLists.txt
Unescape Escape View File

@ -13,7 +13,7 @@ add_subdirectory( config )
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/kwin/lib
${CMAKE_SOURCE_DIR}/twin/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
@ -25,12 +25,12 @@ link_directories(
##### other data ################################
install( FILES quartz.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
install( FILES quartz.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
##### kwin3_quartz (module) #####################
##### twin3_quartz (module) #####################
tde_add_kpart( kwin3_quartz AUTOMOC
tde_add_kpart( twin3_quartz AUTOMOC
SOURCES quartz.cpp
LINK tdecorations-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

10
kwin/clients/quartz/Makefile.am
Unescape Escape View File

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

4
kwin/clients/quartz/config/CMakeLists.txt
Unescape Escape View File

@ -20,9 +20,9 @@ link_directories(
)
##### kwin_quartz_config (module) ###############
##### twin_quartz_config (module) ###############
tde_add_kpart( kwin_quartz_config AUTOMOC
tde_add_kpart( twin_quartz_config AUTOMOC
SOURCES config.cpp
LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

10
kwin/clients/quartz/config/Makefile.am
Unescape Escape View File

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

16
kwin/clients/quartz/config/config.cpp
Unescape Escape View File

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

2
kwin/clients/quartz/quartz.cpp
Unescape Escape View File

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

2
kwin/clients/quartz/quartz.desktop
Unescape Escape View File

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

8
kwin/clients/redmond/CMakeLists.txt
Unescape Escape View File

@ -11,7 +11,7 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/kwin/lib
${CMAKE_SOURCE_DIR}/twin/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
@ -23,12 +23,12 @@ link_directories(
##### other data ################################
install( FILES redmond.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
install( FILES redmond.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
##### kwin3_redmond (module) ####################
##### twin3_redmond (module) ####################
tde_add_kpart( kwin3_redmond AUTOMOC
tde_add_kpart( twin3_redmond AUTOMOC
SOURCES redmond.cpp
LINK tdecorations-shared tdecore-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

10
kwin/clients/redmond/Makefile.am
Unescape Escape View File

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

2
kwin/clients/redmond/redmond.desktop
Unescape Escape View File

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

2
kwin/clients/redmond/redmond.h
Unescape Escape View File

@ -3,7 +3,7 @@
* Redmond KWin client
*
* Copyright 2001-2003
* Ported to kwin_iii by Chris Lee <clee@kde.org>
* Ported to twin_iii by Chris Lee <clee@kde.org>
* Karol Szwed <gallium@kde.org>
* http://gallium.n3.net/
*

16
kwin/clients/test/Makefile.am
Unescape Escape View File

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

2
kwin/clients/test/test.desktop
Unescape Escape View File

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

6
kwin/clients/web/CMakeLists.txt
Unescape Escape View File

@ -22,12 +22,12 @@ link_directories(
##### other data ################################
install( FILES web.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
install( FILES web.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
##### kwin3_web (module) ########################
##### twin3_web (module) ########################
tde_add_kpart( kwin3_web AUTOMOC
tde_add_kpart( twin3_web AUTOMOC
SOURCES Web.cpp WebButton.cpp
LINK tdecorations-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}

10
kwin/clients/web/Makefile.am
Unescape Escape View File

@ -1,15 +1,15 @@
INCLUDES = -I$(top_srcdir) $(all_includes)
kde_module_LTLIBRARIES = kwin3_web.la
kde_module_LTLIBRARIES = twin3_web.la
kwin3_web_la_SOURCES = Web.cpp WebButton.cpp
twin3_web_la_SOURCES = Web.cpp WebButton.cpp
noinst_HEADERS = Web.h WebButton.h
kwin3_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
kwin3_web_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
twin3_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
twin3_web_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
METASOURCES = AUTO
linkdir = $(kde_datadir)/kwin/
linkdir = $(kde_datadir)/twin/
link_DATA = web.desktop
EXTRA_DIST = $(link_DATA)

4
kwin/clients/web/Web.cpp
Unescape Escape View File

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

2
kwin/clients/web/Web.h
Unescape Escape View File

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

2
kwin/clients/web/WebButton.cpp
Unescape Escape View File

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

2
kwin/clients/web/WebButton.h
Unescape Escape View File

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

2
kwin/clients/web/web.desktop
Unescape Escape View File

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

20
kwin/data/CMakeLists.txt
Unescape Escape View File

@ -22,13 +22,13 @@ link_directories(
##### other data ################################
install( FILES
kwin.upd kwinsticky.upd kwiniconify.upd kwin3_plugin.upd
kwin_focus1.upd kwinupdatewindowsettings.upd
kwin_focus2.upd kwin_fsp_workarounds_1.upd
twin.upd twinsticky.upd twiniconify.upd twin3_plugin.upd
twin_focus1.upd twinupdatewindowsettings.upd
twin_focus2.upd twin_fsp_workarounds_1.upd
DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
install( PROGRAMS
pluginlibFix.pl kwin3_plugin.pl kwin_focus1.sh kwin_focus2.sh
pluginlibFix.pl twin3_plugin.pl twin_focus1.sh twin_focus2.sh
DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
install( FILES
@ -36,22 +36,22 @@ install( FILES
DESTINATION ${SOUND_INSTALL_DIR} )
install( FILES
fsp_workarounds_1.kwinrules
DESTINATION ${DATA_INSTALL_DIR}/kwin/default_rules )
fsp_workarounds_1.twinrules
DESTINATION ${DATA_INSTALL_DIR}/twin/default_rules )
##### kwin_update_window_settings (executable) ##
##### twin_update_window_settings (executable) ##
tde_add_executable( kwin_update_window_settings
tde_add_executable( twin_update_window_settings
SOURCES update_window_settings.cpp
LINK tdecore-shared
DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
)
##### kwin_update_default_rules (executable) ####
##### twin_update_default_rules (executable) ####
tde_add_executable( kwin_update_default_rules
tde_add_executable( twin_update_default_rules
SOURCES update_default_rules.cpp
LINK tdecore-shared
DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin

24
kwin/data/Makefile.am
Unescape Escape View File

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

4
kwin/data/kwin.upd
Unescape Escape View File

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

4
kwin/data/kwin3_plugin.pl
Unescape Escape View File

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

4
kwin/data/kwin3_plugin.upd
Unescape Escape View File

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

6
kwin/data/kwin_focus1.upd
Unescape Escape View File

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

6
kwin/data/kwin_focus2.upd
Unescape Escape View File

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

10
kwin/data/kwin_fsp_workarounds_1.upd
Unescape Escape View File

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

2
kwin/data/kwiniconify.upd
Unescape Escape View File

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

2
kwin/data/kwinsticky.upd
Unescape Escape View File

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

8
kwin/data/kwinupdatewindowsettings.upd
Unescape Escape View File

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

4
kwin/data/pluginlibFix.pl
Unescape Escape View File

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

10
kwin/data/update_default_rules.cpp
Unescape Escape View File

@ -8,7 +8,7 @@ You can Freely distribute this program under the GNU General Public
License. See the file "COPYING" for the exact licensing terms.
******************************************************************/
// read addtional window rules and add them to kwinrulesrc
// read addtional window rules and add them to twinrulesrc
#include <dcopclient.h>
#include <kconfig.h>
@ -20,15 +20,15 @@ int main( int argc, char* argv[] )
{
if( argc != 2 )
return 1;
KInstance inst( "kwin_update_default_rules" );
TQString file = locate( "data", TQString( "kwin/default_rules/" ) + argv[ 1 ] );
KInstance inst( "twin_update_default_rules" );
TQString file = locate( "data", TQString( "twin/default_rules/" ) + argv[ 1 ] );
if( file.isEmpty())
{
kdWarning() << "File " << argv[ 1 ] << " not found!" << endl;
return 1;
}
KConfig src_cfg( file );
KConfig dest_cfg( "kwinrulesrc" );
KConfig dest_cfg( "twinrulesrc" );
src_cfg.setGroup( "General" );
dest_cfg.setGroup( "General" );
int count = src_cfg.readNumEntry( "count", 0 );
@ -52,5 +52,5 @@ int main( int argc, char* argv[] )
dest_cfg.sync();
DCOPClient client;
client.attach();
client.send("kwin*", "", "reconfigure()", TQString(""));
client.send("twin*", "", "reconfigure()", TQString(""));
}

8
kwin/data/update_window_settings.cpp
Unescape Escape View File

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

8
kwin/events.cpp
Unescape Escape View File

@ -661,7 +661,7 @@ bool Client::mapRequestEvent( XMapRequestEvent* e )
return true; // no messing with frame etc.
}
if( isTopMenu() && workspace()->managingTopMenus())
return true; // kwin controls these
return true; // twin controls these
switch ( mappingState() )
{
case WithdrawnState:
@ -746,7 +746,7 @@ void Client::clientMessageEvent( XClientMessageEvent* e )
if ( e->message_type == atoms->kde_wm_change_state )
{
if( isTopMenu() && workspace()->managingTopMenus())
return; // kwin controls these
return; // twin controls these
if( e->data.l[ 1 ] )
blockAnimation = true;
if( e->data.l[ 0 ] == IconicState )
@ -770,7 +770,7 @@ void Client::clientMessageEvent( XClientMessageEvent* e )