Revert failed Krazy changes.
svn path=/trunk/KDE/kdebase/workspace/; revision=1043205
This commit is contained in:
parent
5582f69f92
commit
a6e68a5f6f
17 changed files with 4 additions and 18 deletions
|
@ -22,5 +22,4 @@ Name[tr]=Aurorae Dekorasyon Teması Motoru
|
|||
Name[uk]=Рушій декорації тем Aurorae
|
||||
Name[x-test]=xxAurorae Decoration Theme Enginexx
|
||||
Name[zh_TW]=Aurorae 裝飾主題引擎
|
||||
Type=Decoration
|
||||
X-KDE-Library=kwin3_aurorae
|
||||
|
|
|
@ -47,7 +47,6 @@ Comment[uk]=Приклад теми, заснованої на темі стіл
|
|||
Comment[x-test]=xxAn example theme based on the Air desktop theme.xx
|
||||
Comment[zh_TW]=基於 Air 桌面主題的範例主題
|
||||
|
||||
Type=Theme
|
||||
X-KDE-PluginInfo-Author=Martin Gräßlin
|
||||
X-KDE-PluginInfo-Email=kde@martin-graesslin.com
|
||||
X-KDE-PluginInfo-Name=example-deco
|
||||
|
|
|
@ -82,5 +82,4 @@ Name[xh]=B II
|
|||
Name[x-test]=xxB IIxx
|
||||
Name[zh_CN]=B II
|
||||
Name[zh_TW]=B II
|
||||
Type=Decoration
|
||||
X-KDE-Library=kwin3_b2
|
||||
|
|
|
@ -85,5 +85,4 @@ Name[xh]=KDE 2
|
|||
Name[x-test]=xxKDE 2xx
|
||||
Name[zh_CN]=KDE 2
|
||||
Name[zh_TW]=KDE 2
|
||||
Type=Decoration
|
||||
X-KDE-Library=kwin3_kde2
|
||||
|
|
|
@ -85,5 +85,4 @@ Name[xh]=Keramik
|
|||
Name[x-test]=xxKeramikxx
|
||||
Name[zh_CN]=Keramik
|
||||
Name[zh_TW]=Keramik
|
||||
Type=Decoration
|
||||
X-KDE-Library=kwin3_keramik
|
||||
|
|
|
@ -83,5 +83,4 @@ Name[xh]=Umxholo we KWM
|
|||
Name[x-test]=xxKWM Themexx
|
||||
Name[zh_CN]=KWM 主题
|
||||
Name[zh_TW]=KWM 主題
|
||||
Type=Decoration
|
||||
X-KDE-Library=kwin3_kwmtheme
|
||||
|
|
|
@ -83,5 +83,4 @@ Name[xh]=Umphezulu osongiweyo
|
|||
Name[x-test]=xxLaptopxx
|
||||
Name[zh_CN]=笔记本电脑
|
||||
Name[zh_TW]=筆記型電腦
|
||||
Type=Decoration
|
||||
X-KDE-Library=kwin3_laptop
|
||||
|
|
|
@ -82,5 +82,4 @@ Name[wa]=Sistinme modiene
|
|||
Name[x-test]=xxModern Systemxx
|
||||
Name[zh_CN]=现代系统
|
||||
Name[zh_TW]=現代系統
|
||||
Type=Decoration
|
||||
X-KDE-Library=kwin3_modernsys
|
||||
|
|
|
@ -80,5 +80,4 @@ Name[wa]=Ocsidjinne
|
|||
Name[x-test]=xxOxygenxx
|
||||
Name[zh_CN]=Oxygen
|
||||
Name[zh_TW]=Oxygen
|
||||
Type=Decoration
|
||||
X-KDE-Library=kwin3_oxygen
|
||||
|
|
|
@ -83,5 +83,4 @@ Name[wa]=Plastike
|
|||
Name[x-test]=xxPlastikxx
|
||||
Name[zh_CN]=Plastik
|
||||
Name[zh_TW]=Plastik
|
||||
Type=Decoration
|
||||
X-KDE-Library=kwin3_plastik
|
||||
|
|
|
@ -83,5 +83,4 @@ Name[xh]=Quartz
|
|||
Name[x-test]=xxQuartzxx
|
||||
Name[zh_CN]=Quartz
|
||||
Name[zh_TW]=石英
|
||||
Type=Decoration
|
||||
X-KDE-Library=kwin3_quartz
|
||||
|
|
|
@ -84,5 +84,4 @@ Name[xh]=Redmond
|
|||
Name[x-test]=xxRedmondxx
|
||||
Name[zh_CN]=Redmond
|
||||
Name[zh_TW]=Redmond
|
||||
Type=Decoration
|
||||
X-KDE-Library=kwin3_redmond
|
||||
|
|
|
@ -81,5 +81,4 @@ Name[wa]=Saye KWin
|
|||
Name[x-test]=xxKWin testxx
|
||||
Name[zh_CN]=KWin 测试
|
||||
Name[zh_TW]=KWin 測試
|
||||
Type=Decoration
|
||||
X-KDE-Library=kwin3_test
|
||||
|
|
|
@ -84,5 +84,4 @@ Name[xh]=Web
|
|||
Name[x-test]=xxWebxx
|
||||
Name[zh_CN]=网页
|
||||
Name[zh_TW]=網頁
|
||||
Type=Decoration
|
||||
X-KDE-Library=kwin3_web
|
||||
|
|
|
@ -903,7 +903,7 @@ bool EffectsHandlerImpl::loadEffect( const QString& name )
|
|||
assert( current_build_quads == 0 );
|
||||
assert( current_transform == 0 );
|
||||
|
||||
if( !name.toLatin1().startsWith("kwin4_effect_") )
|
||||
if( !name.startsWith("kwin4_effect_") )
|
||||
kWarning( 1212 ) << "Effect names usually have kwin4_effect_ prefix" ;
|
||||
|
||||
// Make sure a single effect won't be loaded multiple times
|
||||
|
|
|
@ -227,7 +227,7 @@ void KWinDecorationModule::findDecorations()
|
|||
KDesktopFile desktopFile(filename);
|
||||
QString libName = desktopFile.desktopGroup().readEntry("X-KDE-Library");
|
||||
|
||||
if (!libName.isEmpty() && libName.toLatin1().startsWith( "kwin3_" ))
|
||||
if (!libName.isEmpty() && libName.startsWith( "kwin3_" ))
|
||||
{
|
||||
DecorationInfo di;
|
||||
di.name = desktopFile.readName();
|
||||
|
@ -590,7 +590,7 @@ void KWinDecorationModule::checkSupportedBorderSizes()
|
|||
|
||||
QString KWinDecorationModule::styleToConfigLib( QString& styleLib )
|
||||
{
|
||||
if( styleLib.toLatin1().startsWith( "kwin3_" ))
|
||||
if( styleLib.startsWith( "kwin3_" ))
|
||||
return "kwin_" + styleLib.mid( 6 ) + "_config";
|
||||
else
|
||||
return styleLib + "_config";
|
||||
|
|
|
@ -106,7 +106,7 @@ bool KDecorationPlugins::loadPlugin( QString nameStr )
|
|||
nameStr = group.readEntry("PluginLib", defaultPlugin );
|
||||
}
|
||||
// make sure people can switch between HEAD and kwin_iii branch
|
||||
if( nameStr.toLatin1().startsWith( "kwin_" ))
|
||||
if( nameStr.startsWith( "kwin_" ))
|
||||
nameStr = "kwin3_" + nameStr.mid( 5 );
|
||||
|
||||
KLibrary *oldLibrary = library;
|
||||
|
|
Loading…
Reference in a new issue