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

added proper flags to handle translations without breaking rc file

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1021406
This commit is contained in:
Hugo Pereira Da Costa 2009-09-09 06:14:01 +00:00
parent af15bebbdd
commit a092867fe5
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
clients/nitrogen/nitrogenexception.cpp
View file

@ -24,6 +24,7 @@
//////////////////////////////////////////////////////////////////////////////
#include <cassert>
#include <KLocale>
#include "nitrogenexception.h"
namespace Nitrogen
@ -40,7 +41,7 @@ namespace Nitrogen
// exception type
setType( type(
group.readEntry( NitrogenConfig::TYPE,
default_configuration.typeName() ) ) );
default_configuration.typeName( false ) ), false ) );
// exception pattern
regExp().setPattern( group.readEntry( NitrogenConfig::PATTERN, QString() ) );
@ -62,7 +63,7 @@ namespace Nitrogen
{
NitrogenConfiguration::write( group );
group.writeEntry( NitrogenConfig::TYPE, typeName() );
group.writeEntry( NitrogenConfig::TYPE, typeName( false ) );
group.writeEntry( NitrogenConfig::PATTERN, regExp().pattern() );
group.writeEntry( NitrogenConfig::ENABLED, enabled() );
group.writeEntry( NitrogenConfig::MASK, mask() );
@ -70,12 +71,12 @@ namespace Nitrogen
}
//_______________________________________________________
QString NitrogenException::typeName( Type type )
QString NitrogenException::typeName( Type type, bool translated )
{
switch( type )
{
case WindowTitle: return "Window Title";
case WindowClassName: return "Window Class Name";
case WindowTitle: return translated ? i18n( "Window Title" ):"Window Title";
case WindowClassName: return translated ? i18n( "Window Class Name" ):"Window Class Name";
default: assert( false );
}
@ -83,10 +84,10 @@ namespace Nitrogen
}
//_______________________________________________________
NitrogenException::Type NitrogenException::type( const QString& value )
NitrogenException::Type NitrogenException::type( const QString& value, bool translated )
{
if( value == "Window Title" ) return WindowTitle;
else if( value == "Window Class Name" ) return WindowClassName;
if( value == typeName( WindowTitle, translated ) ) return WindowTitle;
else if( value == typeName( WindowClassName, translated ) ) return WindowClassName;
else return WindowClassName;
}

8
clients/nitrogen/nitrogenexception.h
View file

@ -122,11 +122,11 @@ namespace Nitrogen
//!@name exception type
//@{
static QString typeName( Type );
static Type type( const QString& name );
static QString typeName( Type, bool );
static Type type( const QString& name, bool );
virtual QString typeName( void ) const
{ return typeName( type() ); }
virtual QString typeName( bool translated ) const
{ return typeName( type(), translated ); }
virtual Type type( void ) const
{ return type_; }