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

Adjust kwin and killer to new ki18n

Browse source 
Setting the ApplicationDomain to kwin, both use the kwin catalog.

The left-over code for catalogs is removed. Note for adjustments:
* scripting doesn't provide an own catalog
* scripts are extracted but there are no scripts with i18n
This commit is contained in:
Martin Gräßlin 2014-04-29 08:51:04 +02:00
parent 5e7d1d586c
commit e80094694e
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Messages.sh
View file

@ -1,3 +1,3 @@
#! /usr/bin/env bash #! /usr/bin/env bash
$EXTRACTRC *.kcfg >> rc.cpp $EXTRACTRC *.kcfg >> rc.cpp
$XGETTEXT *.h *.cpp killer/*.cpp tabbox/*.cpp -o $podir/kwin.pot $XGETTEXT *.h *.cpp killer/*.cpp tabbox/*.cpp scripting/*.cpp -o $podir/kwin.pot

1
killer/killer.cpp
View file

@ -36,6 +36,7 @@ DEALINGS IN THE SOFTWARE.
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
KLocalizedString::setApplicationDomain("kwin");
QApplication app(argc, argv); QApplication app(argc, argv);
QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("kwin"))); QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("kwin")));
QCoreApplication::setApplicationName(QStringLiteral("kwin_killer_helper")); QCoreApplication::setApplicationName(QStringLiteral("kwin_killer_helper"));

7
main.cpp
View file

@ -413,6 +413,7 @@ KWIN_EXPORT int kdemain(int argc, char * argv[])
mallopt(M_TRIM_THRESHOLD, 5*pagesize); mallopt(M_TRIM_THRESHOLD, 5*pagesize);
#endif // M_TRIM_THRESHOLD #endif // M_TRIM_THRESHOLD
KLocalizedString::setApplicationDomain("kwin");
QLoggingCategory::setFilterRules(QStringLiteral("aurorae.debug = true\n") + QLoggingCategory::setFilterRules(QStringLiteral("aurorae.debug = true\n") +
QStringLiteral("kwineffects.debug = true")); QStringLiteral("kwineffects.debug = true"));
@ -536,12 +537,6 @@ KWIN_EXPORT int kdemain(int argc, char * argv[])
KWin::SessionManager weAreIndeed; KWin::SessionManager weAreIndeed;
#endif #endif
KWin::SessionSaveDoneHelper helper; KWin::SessionSaveDoneHelper helper;
#warning insertCatalog needs porting
#if KWIN_QT5_PORTING
KGlobal::locale()->insertCatalog("kwin_effects");
KGlobal::locale()->insertCatalog("kwin_scripts");
KGlobal::locale()->insertCatalog("kwin_scripting");
#endif
QString appname; QString appname;
if (KWin::screen_number == 0) if (KWin::screen_number == 0)