From 1c2f27945c8c50612a75cec6cb773a710b6fad15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Wed, 30 Apr 2014 08:55:58 +0200 Subject: [PATCH] Adjust kcmkwins to new ki18n Define the TRANSLATION_DOMAIN in each of the kcms and use ki18n_wrap_ui. --- kcmkwin/kwindecoration/CMakeLists.txt | 5 ++++- kcmkwin/kwindesktop/CMakeLists.txt | 5 ++++- kcmkwin/kwinoptions/CMakeLists.txt | 4 +++- kcmkwin/kwinrules/CMakeLists.txt | 4 +++- kcmkwin/kwinscreenedges/CMakeLists.txt | 5 ++++- kcmkwin/kwinscripts/CMakeLists.txt | 3 +++ kcmkwin/kwintabbox/CMakeLists.txt | 5 ++++- 7 files changed, 25 insertions(+), 6 deletions(-) diff --git a/kcmkwin/kwindecoration/CMakeLists.txt b/kcmkwin/kwindecoration/CMakeLists.txt index 620ffead58..448817765d 100644 --- a/kcmkwin/kwindecoration/CMakeLists.txt +++ b/kcmkwin/kwindecoration/CMakeLists.txt @@ -1,3 +1,6 @@ +# KI18N Translation Domain for this library +add_definitions(-DTRANSLATION_DOMAIN=\"kcmkwindecoration\") + # need a header file from Aurorae sources include_directories( ${KWIN_SOURCE_DIR}/clients/aurorae/src/lib @@ -16,7 +19,7 @@ set(kcm_kwindecoration_PART_SRCS ${AURORAE_SOURCE_DIR}/themeconfig.cpp ) -qt5_wrap_ui(kcm_kwindecoration_PART_SRCS +ki18n_wrap_ui(kcm_kwindecoration_PART_SRCS auroraeconfig.ui buttons.ui config.ui diff --git a/kcmkwin/kwindesktop/CMakeLists.txt b/kcmkwin/kwindesktop/CMakeLists.txt index feff88ce8e..50f87c1c8a 100644 --- a/kcmkwin/kwindesktop/CMakeLists.txt +++ b/kcmkwin/kwindesktop/CMakeLists.txt @@ -1,9 +1,12 @@ ########### next target ############### +# KI18N Translation Domain for this library +add_definitions(-DTRANSLATION_DOMAIN=\"kcm_kwindesktop\") + include_directories(${KWIN_SOURCE_DIR}/effects) set(kcm_kwindesktop_PART_SRCS main.cpp desktopnameswidget.cpp) -qt5_wrap_ui(kcm_kwindesktop_PART_SRCS main.ui) +ki18n_wrap_ui(kcm_kwindesktop_PART_SRCS main.ui) add_library(kcm_kwindesktop MODULE ${kcm_kwindesktop_PART_SRCS}) diff --git a/kcmkwin/kwinoptions/CMakeLists.txt b/kcmkwin/kwinoptions/CMakeLists.txt index c8ae31b849..851067e43c 100644 --- a/kcmkwin/kwinoptions/CMakeLists.txt +++ b/kcmkwin/kwinoptions/CMakeLists.txt @@ -1,7 +1,9 @@ ########### next target ############### +# KI18N Translation Domain for this library +add_definitions(-DTRANSLATION_DOMAIN=\"kcmkwm\") set(kcm_kwinoptions_PART_SRCS windows.cpp mouse.cpp main.cpp ) -qt5_wrap_ui(kcm_kwinoptions_PART_SRCS actions.ui advanced.ui focus.ui mouse.ui moving.ui) +ki18n_wrap_ui(kcm_kwinoptions_PART_SRCS actions.ui advanced.ui focus.ui mouse.ui moving.ui) add_library(kcm_kwinoptions MODULE ${kcm_kwinoptions_PART_SRCS}) target_link_libraries(kcm_kwinoptions Qt5::DBus KF5::Completion KF5::I18n KF5::ConfigWidgets KF5::Service) install(TARGETS kcm_kwinoptions DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcmkwin/kwinrules/CMakeLists.txt b/kcmkwin/kwinrules/CMakeLists.txt index cd282df6ba..3f64dccb5e 100644 --- a/kcmkwin/kwinrules/CMakeLists.txt +++ b/kcmkwin/kwinrules/CMakeLists.txt @@ -1,3 +1,5 @@ +# KI18N Translation Domain for this library +add_definitions(-DTRANSLATION_DOMAIN=\"kcmkwinrules\") add_definitions(-DKCMRULES) ########### next target ############### @@ -5,7 +7,7 @@ set (kwinrules_MOC_HDRS yesnobox.h ../../client_machine.h ../../cursor.h) qt5_wrap_cpp(kwinrules_MOC_SRCS ${kwinrules_MOC_HDRS}) set(kwinrules_SRCS ruleswidget.cpp ruleslist.cpp kwinsrc.cpp detectwidget.cpp ${kwinrules_MOC_SRCS}) -qt5_wrap_ui(kwinrules_SRCS ruleslist.ui detectwidget.ui editshortcut.ui ruleswidgetbase.ui) +ki18n_wrap_ui(kwinrules_SRCS ruleslist.ui detectwidget.ui editshortcut.ui ruleswidgetbase.ui) set(kwin_rules_dialog_KDEINIT_SRCS main.cpp ${kwinrules_SRCS}) diff --git a/kcmkwin/kwinscreenedges/CMakeLists.txt b/kcmkwin/kwinscreenedges/CMakeLists.txt index 29ad4a9e4f..ca90632e9c 100644 --- a/kcmkwin/kwinscreenedges/CMakeLists.txt +++ b/kcmkwin/kwinscreenedges/CMakeLists.txt @@ -1,3 +1,6 @@ +# KI18N Translation Domain for this library +add_definitions(-DTRANSLATION_DOMAIN=\"kcmkwinscreenedges\") + include_directories(${KWIN_SOURCE_DIR}/effects) set( kcm_kwinscreenedges_PART_SRCS @@ -5,7 +8,7 @@ set( monitor.cpp screenpreviewwidget.cpp ) -qt5_wrap_ui( kcm_kwinscreenedges_PART_SRCS main.ui ) +ki18n_wrap_ui( kcm_kwinscreenedges_PART_SRCS main.ui ) add_library( kcm_kwinscreenedges MODULE ${kcm_kwinscreenedges_PART_SRCS} ) target_link_libraries( kcm_kwinscreenedges ${X11_LIBRARIES} Qt5::DBus diff --git a/kcmkwin/kwinscripts/CMakeLists.txt b/kcmkwin/kwinscripts/CMakeLists.txt index 5fc69d4cd4..4fac2702fb 100644 --- a/kcmkwin/kwinscripts/CMakeLists.txt +++ b/kcmkwin/kwinscripts/CMakeLists.txt @@ -1,3 +1,6 @@ +# KI18N Translation Domain for this library +add_definitions(-DTRANSLATION_DOMAIN=\"kcm-kwin-scripts\") + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h) include_directories(${CMAKE_CURRENT_BINARY_DIR}) diff --git a/kcmkwin/kwintabbox/CMakeLists.txt b/kcmkwin/kwintabbox/CMakeLists.txt index e51df0b2dc..1ee8d29fcb 100644 --- a/kcmkwin/kwintabbox/CMakeLists.txt +++ b/kcmkwin/kwintabbox/CMakeLists.txt @@ -1,3 +1,6 @@ +# KI18N Translation Domain for this library +add_definitions(-DTRANSLATION_DOMAIN=\"kcm_kwintabbox\") + include_directories( ${KWIN_SOURCE_DIR}/effects ${KWIN_SOURCE_DIR}/tabbox ${KWIN_SOURCE_DIR}) ########### next target ############### @@ -9,7 +12,7 @@ set(kcm_kwintabbox_PART_SRCS ${KWIN_SOURCE_DIR}/tabbox/tabboxconfig.cpp ) -qt5_wrap_ui( kcm_kwintabbox_PART_SRCS main.ui ) +ki18n_wrap_ui( kcm_kwintabbox_PART_SRCS main.ui ) add_library(kcm_kwintabbox MODULE ${kcm_kwintabbox_PART_SRCS})