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

insertCatalog() needs porting

Browse source
This commit is contained in:
Martin Gräßlin 2013-07-22 16:18:47 +02:00
parent c2afbcbd87
commit 4425fd3de9
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libkdecorations/kdecoration_plugins_p.cpp
View file

@ -251,6 +251,8 @@ bool KDecorationPlugins::loadPlugin(QString nameStr)
pluginStr = nameStr; pluginStr = nameStr;
// For clients in kdeartwork // For clients in kdeartwork
#warning insertCatalog needs porting
#if KWIN_QT5_PORTING
QString catalog = nameStr; QString catalog = nameStr;
catalog.replace("kwin3_", "kwin_"); catalog.replace("kwin3_", "kwin_");
KGlobal::locale()->insertCatalog(catalog); KGlobal::locale()->insertCatalog(catalog);
@ -260,6 +262,7 @@ bool KDecorationPlugins::loadPlugin(QString nameStr)
KGlobal::locale()->insertCatalog("kwin_clients"); KGlobal::locale()->insertCatalog("kwin_clients");
// For clients in kdeartwork // For clients in kdeartwork
KGlobal::locale()->insertCatalog("kwin_art_clients"); KGlobal::locale()->insertCatalog("kwin_art_clients");
#endif
old_library = oldLibrary; // save for delayed destroying old_library = oldLibrary; // save for delayed destroying
old_fact = oldFactory; old_fact = oldFactory;

3
main.cpp
View file

@ -546,9 +546,12 @@ KDE_EXPORT int kdemain(int argc, char * argv[])
ksmserver.resumeStartup(KWIN_NAME); ksmserver.resumeStartup(KWIN_NAME);
KWin::SessionManager weAreIndeed; KWin::SessionManager weAreIndeed;
KWin::SessionSaveDoneHelper helper; KWin::SessionSaveDoneHelper helper;
#warning insertCatalog needs porting
#if KWIN_QT5_PORTING
KGlobal::locale()->insertCatalog("kwin_effects"); KGlobal::locale()->insertCatalog("kwin_effects");
KGlobal::locale()->insertCatalog("kwin_scripts"); KGlobal::locale()->insertCatalog("kwin_scripts");
KGlobal::locale()->insertCatalog("kwin_scripting"); KGlobal::locale()->insertCatalog("kwin_scripting");
#endif
// Announce when KWIN_DIRECT_GL is set for above HACK // Announce when KWIN_DIRECT_GL is set for above HACK
if (qstrcmp(qgetenv("KWIN_DIRECT_GL"), "1") == 0) if (qstrcmp(qgetenv("KWIN_DIRECT_GL"), "1") == 0)