yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

the easy cases

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=466852
This commit is contained in:
Stephan Kulow 2005-10-03 15:13:54 +00:00
parent 1f4228252c
commit 7a441e1b7a
13 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clients/b2/config/config.cpp
View file

@ -36,7 +36,7 @@ extern "C"
B2Config::B2Config( KConfig* conf, QWidget* parent )
: QObject( parent )
{
KGlobal::locale()->insertCatalogue("kwin_b2_config");
KGlobal::locale()->insertCatalog("kwin_b2_config");
b2Config = new KConfig("kwinb2rc");
gb = new KVBox(parent);

2
clients/default/config/config.cpp
View file

@ -32,7 +32,7 @@ extern "C"
KDEDefaultConfig::KDEDefaultConfig( KConfig* conf, QWidget* parent )
: QObject( parent )
{
KGlobal::locale()->insertCatalogue("kwin_clients");
KGlobal::locale()->insertCatalog("kwin_clients");
highcolor = QPixmap::defaultDepth() > 8;
gb = new KVBox( parent );
gb->setSpacing( KDialog::spacingHint() );

2
clients/keramik/config/config.cpp
View file

@ -51,7 +51,7 @@ extern "C"
KeramikConfig::KeramikConfig( KConfig* conf, QWidget* parent )
: QObject( parent )
{
KGlobal::locale()->insertCatalogue("kwin_clients");
KGlobal::locale()->insertCatalog("kwin_clients");
c = new KConfig( "kwinkeramikrc" );
ui = new KeramikConfigUI( parent );

2
clients/modernsystem/config/config.cpp
View file

@ -33,7 +33,7 @@ extern "C"
ModernSysConfig::ModernSysConfig(KConfig* conf, QWidget* parent) : QObject(parent)
{
clientrc = new KConfig("kwinmodernsysrc");
KGlobal::locale()->insertCatalogue("kwin_clients");
KGlobal::locale()->insertCatalog("kwin_clients");
mainw = new QWidget(parent);
vbox = new QVBoxLayout(mainw);
vbox->setSpacing(6);

2
clients/plastik/config/config.cpp
View file

@ -39,7 +39,7 @@ PlastikConfig::PlastikConfig(KConfig* config, QWidget* parent)
{
// create the configuration object
m_config = new KConfig("kwinplastikrc");
KGlobal::locale()->insertCatalogue("kwin_clients");
KGlobal::locale()->insertCatalog("kwin_clients");
// create and show the configuration dialog
m_dialog = new ConfigDialog(parent);

2
clients/quartz/config/config.cpp
View file

@ -35,7 +35,7 @@ QuartzConfig::QuartzConfig( KConfig* conf, QWidget* parent )
: QObject( parent )
{
quartzConfig = new KConfig("kwinquartzrc");
KGlobal::locale()->insertCatalogue("kwin_clients");
KGlobal::locale()->insertCatalog("kwin_clients");
gb = new KVBox( parent );
cbColorBorder = new QCheckBox(
i18n("Draw window frames using &titlebar colors"), gb );

12
kcmkwin/kwinoptions/main.cpp
View file

@ -41,7 +41,7 @@ extern "C"
KDE_EXPORT KCModule *create_kwinfocus(QWidget *parent, const char *name)
{
//CT there's need for decision: kwm or kwin?
KGlobal::locale()->insertCatalogue("kcmkwm");
KGlobal::locale()->insertCatalog("kcmkwm");
KConfig *c = new KConfig("kwinrc", false, true);
return new KFocusConfig(true, c, parent, name);
}
@ -49,14 +49,14 @@ extern "C"
KDE_EXPORT KCModule *create_kwinactions(QWidget *parent, const char *name)
{
//CT there's need for decision: kwm or kwin?
KGlobal::locale()->insertCatalogue("kcmkwm");
KGlobal::locale()->insertCatalog("kcmkwm");
return new KActionsOptions( parent, name);
}
KDE_EXPORT KCModule *create_kwinmoving(QWidget *parent, const char *name)
{
//CT there's need for decision: kwm or kwin?
KGlobal::locale()->insertCatalogue("kcmkwm");
KGlobal::locale()->insertCatalog("kcmkwm");
KConfig *c = new KConfig("kwinrc", false, true);
return new KMovingConfig(true, c, parent, name);
}
@ -64,7 +64,7 @@ extern "C"
KDE_EXPORT KCModule *create_kwinadvanced(QWidget *parent, const char *name)
{
//CT there's need for decision: kwm or kwin?
KGlobal::locale()->insertCatalogue("kcmkwm");
KGlobal::locale()->insertCatalog("kcmkwm");
KConfig *c = new KConfig("kwinrc", false, true);
return new KAdvancedConfig(true, c, parent, name);
}
@ -72,7 +72,7 @@ extern "C"
KDE_EXPORT KCModule *create_kwintranslucency(QWidget *parent, const char *name)
{
//CT there's need for decision: kwm or kwin?
KGlobal::locale()->insertCatalogue("kcmkwm");
KGlobal::locale()->insertCatalog("kcmkwm");
KConfig *c = new KConfig("kwinrc", false, true);
return new KTranslucencyConfig(true, c, parent, name);
}
@ -80,7 +80,7 @@ extern "C"
KDE_EXPORT KCModule *create_kwinoptions ( QWidget *parent, const char* name)
{
//CT there's need for decision: kwm or kwin?
KGlobal::locale()->insertCatalogue("kcmkwm");
KGlobal::locale()->insertCatalog("kcmkwm");
return new KWinOptions( parent, name);
}
}

2
kcmkwin/kwinrules/kcm.cpp
View file

@ -33,7 +33,7 @@ extern "C"
KDE_EXPORT KCModule *create_kwinrules( QWidget *parent, const char *name )
{
//CT there's need for decision: kwm or kwin?
KGlobal::locale()->insertCatalogue( "kcmkwinrules" );
KGlobal::locale()->insertCatalog( "kcmkwinrules" );
return new KWinInternal::KCMRules( parent, name );
}

2
kcmkwin/kwinrules/main.cpp
View file

@ -271,7 +271,7 @@ static const KCmdLineOptions options[] =
extern "C"
KDE_EXPORT int kdemain( int argc, char* argv[] )
{
KLocale::setMainCatalogue( "kcmkwinrules" );
KLocale::setMainCatalog( "kcmkwinrules" );
KCmdLineArgs::init( argc, argv, "kwin_rules_dialog", I18N_NOOP( "KWin" ),
I18N_NOOP( "KWin helper utility" ), "1.0" );
KCmdLineArgs::addCmdLineOptions( options );

2
killer/killer.cpp
View file

@ -46,7 +46,7 @@ static const KCmdLineOptions options[] =
int main( int argc, char* argv[] )
{
KLocale::setMainCatalogue( "kwin" ); // the messages are in kwin's .po file
KLocale::setMainCatalog( "kwin" ); // the messages are in kwin's .po file
KCmdLineArgs::init( argc, argv, "kwin_killer_helper", I18N_NOOP( "KWin" ),
I18N_NOOP( "KWin helper utility" ), "1.0" );
KCmdLineArgs::addCmdLineOptions( options );

8
lib/kdecoration_plugins_p.cpp
View file

@ -169,13 +169,13 @@ bool KDecorationPlugins::loadPlugin( QString nameStr )
// For clients in kdeartwork
QString catalogue = nameStr;
catalogue.replace( "kwin3_", "kwin_" );
KGlobal::locale()->insertCatalogue( catalogue );
KGlobal::locale()->insertCatalog( catalogue );
// For KCommonDecoration based clients
KGlobal::locale()->insertCatalogue( "kwin_lib" );
KGlobal::locale()->insertCatalog( "kwin_lib" );
// For clients in kdebase
KGlobal::locale()->insertCatalogue( "kwin_clients" );
KGlobal::locale()->insertCatalog( "kwin_clients" );
// For clients in kdeartwork
KGlobal::locale()->insertCatalogue( "kwin_art_clients" );
KGlobal::locale()->insertCatalog( "kwin_art_clients" );
old_library = oldLibrary; // save for delayed destroying
old_fact = oldFactory;

5
useractions.cpp
View file

@ -33,6 +33,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <qregexp.h>
#include <Q3PopupMenu>
#include <QVBoxLayout>
#include <kauthorized.h>
#include "killwindow.h"
#include "tabbox.h"
@ -98,7 +99,7 @@ Q3PopupMenu* Workspace::clientPopup()
popup->insertSeparator();
if (!KGlobal::config()->isImmutable() &&
!kapp->authorizeControlModules(Workspace::configModules(true)).isEmpty())
!KAuthorized::authorizeKActionControlModules(Workspace::configModules(true)).isEmpty())
{
popup->insertItem(SmallIconSet( "configure" ), i18n("Configur&e Window Behavior..."), this, SLOT( configureWM() ));
popup->insertSeparator();
@ -974,7 +975,7 @@ void Workspace::slotWindowOperations()
void Workspace::showWindowMenu( const QRect &pos, Client* cl )
{
if (!kapp->authorizeKAction("kwin_rmb"))
if (!KAuthorized::authorizeKAction("kwin_rmb"))
return;
if( !cl )
return;

3
workspace.cpp
View file

@ -47,6 +47,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <X11/cursorfont.h>
#include <QX11Info>
#include <stdio.h>
#include <kauthorized.h>
namespace KWinInternal
{
@ -964,7 +965,7 @@ QStringList Workspace::configModules(bool controlCenter)
args << "kde-kwindecoration.desktop";
if (controlCenter)
args << "kde-kwinoptions.desktop";
else if (kapp->authorizeControlModule("kde-kwinoptions.desktop"))
else if (KAuthorized::authorizeKActionControlModule("kde-kwinoptions.desktop"))
args << "kwinactions" << "kwinfocus" << "kwinmoving" << "kwinadvanced" << "kwinrules" << "kwintranslucency";
return args;
}