From 5e7d1d586cac1f42e519490fa4e572463ce7634c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Tue, 29 Apr 2014 08:25:19 +0200 Subject: [PATCH] Adjust effects_builtins for new ki18n * Use ki18n_wrap_ui for ui files * define TRANSLATION_DOMAIN in CMakeLists.txt --- effects/CMakeLists.txt | 3 +++ effects/blur/CMakeLists.txt | 2 +- effects/coverswitch/CMakeLists.txt | 2 +- effects/cube/CMakeLists.txt | 4 ++-- effects/dashboard/CMakeLists.txt | 2 +- effects/desktopgrid/CMakeLists.txt | 2 +- effects/diminactive/CMakeLists.txt | 2 +- effects/flipswitch/CMakeLists.txt | 2 +- effects/glide/CMakeLists.txt | 2 +- effects/lookingglass/CMakeLists.txt | 2 +- effects/magiclamp/CMakeLists.txt | 2 +- effects/magnifier/CMakeLists.txt | 2 +- effects/mouseclick/CMakeLists.txt | 2 +- effects/mousemark/CMakeLists.txt | 2 +- effects/presentwindows/CMakeLists.txt | 2 +- effects/resize/CMakeLists.txt | 2 +- effects/showfps/CMakeLists.txt | 2 +- effects/thumbnailaside/CMakeLists.txt | 2 +- effects/trackmouse/CMakeLists.txt | 2 +- effects/windowgeometry/CMakeLists.txt | 2 +- effects/wobblywindows/CMakeLists.txt | 2 +- effects/zoom/CMakeLists.txt | 2 +- 22 files changed, 25 insertions(+), 22 deletions(-) diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt index d92c2a08b8..3a90b20c21 100644 --- a/effects/CMakeLists.txt +++ b/effects/CMakeLists.txt @@ -1,3 +1,6 @@ +# KI18N Translation Domain for this library +add_definitions(-DTRANSLATION_DOMAIN=\"kwin_effects\") + include_directories(${KWIN_SOURCE_DIR}) # for xcbutils.h set(kwin_effect_OWN_LIBS diff --git a/effects/blur/CMakeLists.txt b/effects/blur/CMakeLists.txt index f97fa7af5a..afe5b65f13 100644 --- a/effects/blur/CMakeLists.txt +++ b/effects/blur/CMakeLists.txt @@ -1,7 +1,7 @@ ####################################### # Config set(kwin_blur_config_SRCS blur_config.cpp) -qt5_wrap_ui(kwin_blur_config_SRCS blur_config.ui) +ki18n_wrap_ui(kwin_blur_config_SRCS blur_config.ui) qt5_add_dbus_interface(kwin_blur_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) kconfig_add_kcfg_files(kwin_blur_config_SRCS blurconfig.kcfgc) diff --git a/effects/coverswitch/CMakeLists.txt b/effects/coverswitch/CMakeLists.txt index 081944534b..691faf43e5 100644 --- a/effects/coverswitch/CMakeLists.txt +++ b/effects/coverswitch/CMakeLists.txt @@ -11,7 +11,7 @@ install( FILES ####################################### # Config set(kwin_coverswitch_config_SRCS coverswitch_config.cpp) -qt5_wrap_ui(kwin_coverswitch_config_SRCS coverswitch_config.ui) +ki18n_wrap_ui(kwin_coverswitch_config_SRCS coverswitch_config.ui) qt5_add_dbus_interface(kwin_coverswitch_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) kconfig_add_kcfg_files(kwin_coverswitch_config_SRCS coverswitchconfig.kcfgc) diff --git a/effects/cube/CMakeLists.txt b/effects/cube/CMakeLists.txt index ba2cc292ac..2562689526 100644 --- a/effects/cube/CMakeLists.txt +++ b/effects/cube/CMakeLists.txt @@ -27,7 +27,7 @@ install( FILES # cube set(kwin_cube_config_SRCS cube_config.cpp) -qt5_wrap_ui(kwin_cube_config_SRCS cube_config.ui) +ki18n_wrap_ui(kwin_cube_config_SRCS cube_config.ui) qt5_add_dbus_interface(kwin_cube_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) kconfig_add_kcfg_files(kwin_cube_config_SRCS cubeconfig.kcfgc) @@ -46,7 +46,7 @@ kservice_desktop_to_json(kwin_cube_config cube_config.desktop) # cube slide set(kwin_cubeslide_config_SRCS cubeslide_config.cpp) -qt5_wrap_ui(kwin_cubeslide_config_SRCS cubeslide_config.ui) +ki18n_wrap_ui(kwin_cubeslide_config_SRCS cubeslide_config.ui) qt5_add_dbus_interface(kwin_cubeslide_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) kconfig_add_kcfg_files(kwin_cubeslide_config_SRCS cubeslideconfig.kcfgc) diff --git a/effects/dashboard/CMakeLists.txt b/effects/dashboard/CMakeLists.txt index e3ad99e4ab..d55d16c21e 100644 --- a/effects/dashboard/CMakeLists.txt +++ b/effects/dashboard/CMakeLists.txt @@ -1,7 +1,7 @@ ####################################### # Config set(kwin_dashboard_config_SRCS dashboard_config.cpp) -qt5_wrap_ui(kwin_dashboard_config_SRCS dashboard_config.ui) +ki18n_wrap_ui(kwin_dashboard_config_SRCS dashboard_config.ui) qt5_add_dbus_interface(kwin_dashboard_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) kconfig_add_kcfg_files(kwin_dashboard_config_SRCS dashboardconfig.kcfgc) diff --git a/effects/desktopgrid/CMakeLists.txt b/effects/desktopgrid/CMakeLists.txt index 36c49d21f0..4764374359 100644 --- a/effects/desktopgrid/CMakeLists.txt +++ b/effects/desktopgrid/CMakeLists.txt @@ -8,7 +8,7 @@ install( FILES ####################################### # Config set(kwin_desktopgrid_config_SRCS desktopgrid_config.cpp) -qt5_wrap_ui(kwin_desktopgrid_config_SRCS desktopgrid_config.ui) +ki18n_wrap_ui(kwin_desktopgrid_config_SRCS desktopgrid_config.ui) qt5_add_dbus_interface(kwin_desktopgrid_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) kconfig_add_kcfg_files(kwin_desktopgrid_config_SRCS desktopgridconfig.kcfgc) diff --git a/effects/diminactive/CMakeLists.txt b/effects/diminactive/CMakeLists.txt index 55509c1cbd..221bc8fc0f 100644 --- a/effects/diminactive/CMakeLists.txt +++ b/effects/diminactive/CMakeLists.txt @@ -1,7 +1,7 @@ ####################################### # Config set(kwin_diminactive_config_SRCS diminactive_config.cpp) -qt5_wrap_ui(kwin_diminactive_config_SRCS diminactive_config.ui) +ki18n_wrap_ui(kwin_diminactive_config_SRCS diminactive_config.ui) qt5_add_dbus_interface(kwin_diminactive_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) kconfig_add_kcfg_files(kwin_diminactive_config_SRCS diminactiveconfig.kcfgc) diff --git a/effects/flipswitch/CMakeLists.txt b/effects/flipswitch/CMakeLists.txt index 13b2fc9f9c..a0d011ea4b 100644 --- a/effects/flipswitch/CMakeLists.txt +++ b/effects/flipswitch/CMakeLists.txt @@ -1,7 +1,7 @@ ####################################### # Config set(kwin_flipswitch_config_SRCS flipswitch_config.cpp) -qt5_wrap_ui(kwin_flipswitch_config_SRCS flipswitch_config.ui) +ki18n_wrap_ui(kwin_flipswitch_config_SRCS flipswitch_config.ui) qt5_add_dbus_interface(kwin_flipswitch_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) kconfig_add_kcfg_files(kwin_flipswitch_config_SRCS flipswitchconfig.kcfgc) diff --git a/effects/glide/CMakeLists.txt b/effects/glide/CMakeLists.txt index 76495d9b3e..9f8c47ffb7 100644 --- a/effects/glide/CMakeLists.txt +++ b/effects/glide/CMakeLists.txt @@ -1,7 +1,7 @@ ####################################### # Config set(kwin_glide_config_SRCS glide_config.cpp) -qt5_wrap_ui(kwin_glide_config_SRCS glide_config.ui) +ki18n_wrap_ui(kwin_glide_config_SRCS glide_config.ui) qt5_add_dbus_interface(kwin_glide_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) kconfig_add_kcfg_files(kwin_glide_config_SRCS glideconfig.kcfgc) diff --git a/effects/lookingglass/CMakeLists.txt b/effects/lookingglass/CMakeLists.txt index c715f733a3..796697e494 100644 --- a/effects/lookingglass/CMakeLists.txt +++ b/effects/lookingglass/CMakeLists.txt @@ -12,7 +12,7 @@ install( FILES ####################################### # Config set(kwin_lookingglass_config_SRCS lookingglass_config.cpp) -qt5_wrap_ui(kwin_lookingglass_config_SRCS lookingglass_config.ui) +ki18n_wrap_ui(kwin_lookingglass_config_SRCS lookingglass_config.ui) qt5_add_dbus_interface(kwin_lookingglass_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) kconfig_add_kcfg_files(kwin_lookingglass_config_SRCS lookingglassconfig.kcfgc) diff --git a/effects/magiclamp/CMakeLists.txt b/effects/magiclamp/CMakeLists.txt index c1988a8dd6..5227f1ded8 100644 --- a/effects/magiclamp/CMakeLists.txt +++ b/effects/magiclamp/CMakeLists.txt @@ -1,7 +1,7 @@ ####################################### # Config set(kwin_magiclamp_config_SRCS magiclamp_config.cpp) -qt5_wrap_ui(kwin_magiclamp_config_SRCS magiclamp_config.ui) +ki18n_wrap_ui(kwin_magiclamp_config_SRCS magiclamp_config.ui) qt5_add_dbus_interface(kwin_magiclamp_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) kconfig_add_kcfg_files(kwin_magiclamp_config_SRCS magiclampconfig.kcfgc) diff --git a/effects/magnifier/CMakeLists.txt b/effects/magnifier/CMakeLists.txt index deae988365..6a43377176 100644 --- a/effects/magnifier/CMakeLists.txt +++ b/effects/magnifier/CMakeLists.txt @@ -1,7 +1,7 @@ ####################################### # Config set(kwin_magnifier_config_SRCS magnifier_config.cpp) -qt5_wrap_ui(kwin_magnifier_config_SRCS magnifier_config.ui) +ki18n_wrap_ui(kwin_magnifier_config_SRCS magnifier_config.ui) qt5_add_dbus_interface(kwin_magnifier_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) kconfig_add_kcfg_files(kwin_magnifier_config_SRCS magnifierconfig.kcfgc) diff --git a/effects/mouseclick/CMakeLists.txt b/effects/mouseclick/CMakeLists.txt index a4a9739278..251e8e7448 100644 --- a/effects/mouseclick/CMakeLists.txt +++ b/effects/mouseclick/CMakeLists.txt @@ -2,7 +2,7 @@ ## configurtion dialog ########################## set(kwin_mouseclick_config_SRCS mouseclick_config.cpp) -qt5_wrap_ui(kwin_mouseclick_config_SRCS mouseclick_config.ui) +ki18n_wrap_ui(kwin_mouseclick_config_SRCS mouseclick_config.ui) qt5_add_dbus_interface(kwin_mouseclick_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) kconfig_add_kcfg_files(kwin_mouseclick_config_SRCS mouseclickconfig.kcfgc) diff --git a/effects/mousemark/CMakeLists.txt b/effects/mousemark/CMakeLists.txt index 3abb33a418..71e20bad62 100644 --- a/effects/mousemark/CMakeLists.txt +++ b/effects/mousemark/CMakeLists.txt @@ -1,7 +1,7 @@ ####################################### # Config set(kwin_mousemark_config_SRCS mousemark_config.cpp) -qt5_wrap_ui(kwin_mousemark_config_SRCS mousemark_config.ui) +ki18n_wrap_ui(kwin_mousemark_config_SRCS mousemark_config.ui) qt5_add_dbus_interface(kwin_mousemark_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) kconfig_add_kcfg_files(kwin_mousemark_config_SRCS mousemarkconfig.kcfgc) diff --git a/effects/presentwindows/CMakeLists.txt b/effects/presentwindows/CMakeLists.txt index 7725f9da44..10e6a0b91c 100644 --- a/effects/presentwindows/CMakeLists.txt +++ b/effects/presentwindows/CMakeLists.txt @@ -8,7 +8,7 @@ install( FILES ####################################### # Config set(kwin_presentwindows_config_SRCS presentwindows_config.cpp) -qt5_wrap_ui(kwin_presentwindows_config_SRCS presentwindows_config.ui) +ki18n_wrap_ui(kwin_presentwindows_config_SRCS presentwindows_config.ui) qt5_add_dbus_interface(kwin_presentwindows_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) kconfig_add_kcfg_files(kwin_presentwindows_config_SRCS presentwindowsconfig.kcfgc) diff --git a/effects/resize/CMakeLists.txt b/effects/resize/CMakeLists.txt index f643ef0666..0f6b442a98 100644 --- a/effects/resize/CMakeLists.txt +++ b/effects/resize/CMakeLists.txt @@ -1,7 +1,7 @@ ####################################### # Config set(kwin_resize_config_SRCS resize_config.cpp) -qt5_wrap_ui(kwin_resize_config_SRCS resize_config.ui) +ki18n_wrap_ui(kwin_resize_config_SRCS resize_config.ui) qt5_add_dbus_interface(kwin_resize_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) kconfig_add_kcfg_files(kwin_resize_config_SRCS resizeconfig.kcfgc) diff --git a/effects/showfps/CMakeLists.txt b/effects/showfps/CMakeLists.txt index 9fd33be95e..c8de55ba1c 100644 --- a/effects/showfps/CMakeLists.txt +++ b/effects/showfps/CMakeLists.txt @@ -1,7 +1,7 @@ ####################################### # Config set(kwin_showfps_config_SRCS showfps_config.cpp) -qt5_wrap_ui(kwin_showfps_config_SRCS showfps_config.ui) +ki18n_wrap_ui(kwin_showfps_config_SRCS showfps_config.ui) qt5_add_dbus_interface(kwin_showfps_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) kconfig_add_kcfg_files(kwin_showfps_config_SRCS showfpsconfig.kcfgc) diff --git a/effects/thumbnailaside/CMakeLists.txt b/effects/thumbnailaside/CMakeLists.txt index 02bf6b6336..8cd89a2fda 100644 --- a/effects/thumbnailaside/CMakeLists.txt +++ b/effects/thumbnailaside/CMakeLists.txt @@ -1,7 +1,7 @@ ####################################### # Config set(kwin_thumbnailaside_config_SRCS thumbnailaside_config.cpp) -qt5_wrap_ui(kwin_thumbnailaside_config_SRCS thumbnailaside_config.ui) +ki18n_wrap_ui(kwin_thumbnailaside_config_SRCS thumbnailaside_config.ui) qt5_add_dbus_interface(kwin_thumbnailaside_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) kconfig_add_kcfg_files(kwin_thumbnailaside_config_SRCS thumbnailasideconfig.kcfgc) diff --git a/effects/trackmouse/CMakeLists.txt b/effects/trackmouse/CMakeLists.txt index b2ee1c7451..3e68bea37b 100644 --- a/effects/trackmouse/CMakeLists.txt +++ b/effects/trackmouse/CMakeLists.txt @@ -9,7 +9,7 @@ install( FILES ####################################### # Config set(kwin_trackmouse_config_SRCS trackmouse_config.cpp) -qt5_wrap_ui(kwin_trackmouse_config_SRCS trackmouse_config.ui) +ki18n_wrap_ui(kwin_trackmouse_config_SRCS trackmouse_config.ui) qt5_add_dbus_interface(kwin_trackmouse_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) kconfig_add_kcfg_files(kwin_trackmouse_config_SRCS trackmouseconfig.kcfgc) diff --git a/effects/windowgeometry/CMakeLists.txt b/effects/windowgeometry/CMakeLists.txt index 3641700faa..bbf2fc691c 100644 --- a/effects/windowgeometry/CMakeLists.txt +++ b/effects/windowgeometry/CMakeLists.txt @@ -1,7 +1,7 @@ ####################################### # Config set(kwin_windowgeometry_config_SRCS windowgeometry_config.cpp) -qt5_wrap_ui(kwin_windowgeometry_config_SRCS windowgeometry_config.ui) +ki18n_wrap_ui(kwin_windowgeometry_config_SRCS windowgeometry_config.ui) qt5_add_dbus_interface(kwin_windowgeometry_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) kconfig_add_kcfg_files(kwin_windowgeometry_config_SRCS windowgeometryconfig.kcfgc) diff --git a/effects/wobblywindows/CMakeLists.txt b/effects/wobblywindows/CMakeLists.txt index f74a485854..a2db98fc2d 100644 --- a/effects/wobblywindows/CMakeLists.txt +++ b/effects/wobblywindows/CMakeLists.txt @@ -1,7 +1,7 @@ ####################################### # Config set(kwin_wobblywindows_config_SRCS wobblywindows_config.cpp) -qt5_wrap_ui(kwin_wobblywindows_config_SRCS wobblywindows_config.ui) +ki18n_wrap_ui(kwin_wobblywindows_config_SRCS wobblywindows_config.ui) qt5_add_dbus_interface(kwin_wobblywindows_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) kconfig_add_kcfg_files(kwin_wobblywindows_config_SRCS wobblywindowsconfig.kcfgc) diff --git a/effects/zoom/CMakeLists.txt b/effects/zoom/CMakeLists.txt index e2e38a8501..7a86c08e4d 100644 --- a/effects/zoom/CMakeLists.txt +++ b/effects/zoom/CMakeLists.txt @@ -1,7 +1,7 @@ ####################################### # Config set(kwin_zoom_config_SRCS zoom_config.cpp) -qt5_wrap_ui(kwin_zoom_config_SRCS zoom_config.ui) +ki18n_wrap_ui(kwin_zoom_config_SRCS zoom_config.ui) qt5_add_dbus_interface(kwin_zoom_config_SRCS ${kwin_effects_dbus_xml} kwineffects_interface) kconfig_add_kcfg_files(kwin_zoom_config_SRCS zoomconfig.kcfgc)