[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:25:22 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=8d6f4b7
The following commit has been merged in the master branch:
commit 8d6f4b7f91ea66086a46a81c6111dab825b7fb63
Author: Alexander Potashev <aspotashev at gmail.com>
Date: Mon May 4 18:29:51 2015 +0300
Move config/* into subdirectories and fix untranslatable strings
Fixed untranslatable strings by:
1. Extracting strings from all *.cpp and *.ui files,
2. Setting the correct translations domains for each KCM.
BUG: 340804
---
config/CMakeLists.txt | 63 ++--------------------
config/Messages.sh | 8 ---
config/appearance/CMakeLists.txt | 24 +++++++++
config/appearance/Messages.sh | 4 ++
config/{ => appearance}/appearance-config-tab.cpp | 0
config/{ => appearance}/appearance-config-tab.h | 0
config/{ => appearance}/appearance-config.cpp | 0
config/{ => appearance}/appearance-config.h | 0
config/{ => appearance}/appearance-config.ui | 0
.../kcm_ktp_chat_appearance.desktop | 0
config/behavior/CMakeLists.txt | 23 ++++++++
config/behavior/Messages.sh | 4 ++
config/{ => behavior}/behavior-config.cpp | 0
config/{ => behavior}/behavior-config.h | 0
config/{ => behavior}/behavior-config.ui | 0
.../{ => behavior}/kcm_ktp_chat_behavior.desktop | 0
config/messages/CMakeLists.txt | 20 +++++++
config/messages/Messages.sh | 2 +
.../{ => messages}/kcm_ktp_chat_messages.desktop | 0
config/{ => messages}/messages-config.cpp | 0
config/{ => messages}/messages-config.h | 0
config/otr/CMakeLists.txt | 24 +++++++++
config/otr/Messages.sh | 4 ++
config/{ => otr}/kcm_ktp_chat_otr.desktop | 0
config/{ => otr}/otr-config.cpp | 0
config/{ => otr}/otr-config.h | 0
config/{ => otr}/otr-config.ui | 0
27 files changed, 109 insertions(+), 67 deletions(-)
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
index 4123ac3..1b1157b 100644
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@@ -1,62 +1,7 @@
include_directories(${CMAKE_SOURCE_DIR}/lib)
include_directories(${CMAKE_SOURCE_DIR}/image-sharer)
-set(kcm_ktp_chat_appearance_SRCS appearance-config-tab.cpp appearance-config.cpp)
-set(kcm_ktp_chat_behavior_SRCS behavior-config.cpp)
-set(kcm_ktp_chat_messages_SRCS messages-config.cpp)
-set(kcm_ktp_chat_otr_SRCS otr-config.cpp)
-
-set(kcm_ktp_chat_appearance_UI appearance-config.ui)
-set(kcm_ktp_chat_behavior_UI behavior-config.ui)
-set(kcm_ktp_chat_otr_UI otr-config.ui)
-
-ki18n_wrap_ui(kcm_ktp_chat_appearance_SRCS ${kcm_ktp_chat_appearance_UI})
-ki18n_wrap_ui(kcm_ktp_chat_behavior_SRCS ${kcm_ktp_chat_behavior_UI})
-ki18n_wrap_ui(kcm_ktp_chat_otr_SRCS ${kcm_ktp_chat_otr_UI})
-
-add_library(kcm_ktp_chat_appearance MODULE ${kcm_ktp_chat_appearance_SRCS})
-add_library(kcm_ktp_chat_behavior MODULE ${kcm_ktp_chat_behavior_SRCS})
-add_library(kcm_ktp_chat_messages MODULE ${kcm_ktp_chat_messages_SRCS})
-add_library(kcm_ktp_chat_otr MODULE ${kcm_ktp_chat_otr_SRCS})
-
-target_link_libraries(kcm_ktp_chat_appearance
- Qt5::WebKitWidgets
- KF5::KCMUtils
- KF5::WidgetsAddons
- KF5::IconThemes
- ktpchat
-)
-target_link_libraries(kcm_ktp_chat_behavior
- KF5::TextWidgets
- KF5::KCMUtils
- ktpchat
- ktpimagesharer
-)
-target_link_libraries(kcm_ktp_chat_messages
- KF5::KCMUtils
- KTp::CommonInternals
- ktpchat
-)
-
-target_link_libraries(kcm_ktp_chat_otr
- KF5::KCMUtils
- KF5::WidgetsAddons
- KTp::CommonInternals
- KTp::OTR
- ktpchat
-)
-
-install(TARGETS
- kcm_ktp_chat_appearance
- kcm_ktp_chat_behavior
- kcm_ktp_chat_messages
- kcm_ktp_chat_otr
- DESTINATION ${PLUGIN_INSTALL_DIR}
-)
-install(FILES
- kcm_ktp_chat_appearance.desktop
- kcm_ktp_chat_behavior.desktop
- kcm_ktp_chat_messages.desktop
- kcm_ktp_chat_otr.desktop
- DESTINATION ${SERVICES_INSTALL_DIR}
-)
+add_subdirectory(appearance)
+add_subdirectory(behavior)
+add_subdirectory(messages)
+add_subdirectory(otr)
diff --git a/config/Messages.sh b/config/Messages.sh
deleted file mode 100755
index fb118d3..0000000
--- a/config/Messages.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /usr/bin/env bash
-$EXTRACTRC appearance-config.ui >> rc.cpp || exit 11
-$XGETTEXT appearance-config.cpp rc.cpp -o $podir/kcm_ktp_chat_appearance.pot
-rm -f rc.cpp
-
-$EXTRACTRC behavior-config.ui >> rc.cpp || exit 11
-$XGETTEXT behavior-config.cpp rc.cpp -o $podir/kcm_ktp_chat_behavior.pot
-rm -f rc.cpp
diff --git a/config/appearance/CMakeLists.txt b/config/appearance/CMakeLists.txt
new file mode 100644
index 0000000..dfb5d04
--- /dev/null
+++ b/config/appearance/CMakeLists.txt
@@ -0,0 +1,24 @@
+add_definitions(-DTRANSLATION_DOMAIN=\"kcm_ktp_chat_appearance\")
+
+set(kcm_ktp_chat_appearance_SRCS appearance-config-tab.cpp appearance-config.cpp)
+set(kcm_ktp_chat_appearance_UI appearance-config.ui)
+
+ki18n_wrap_ui(kcm_ktp_chat_appearance_SRCS ${kcm_ktp_chat_appearance_UI})
+add_library(kcm_ktp_chat_appearance MODULE ${kcm_ktp_chat_appearance_SRCS})
+
+target_link_libraries(kcm_ktp_chat_appearance
+ Qt5::WebKitWidgets
+ KF5::KCMUtils
+ KF5::WidgetsAddons
+ KF5::IconThemes
+ ktpchat
+)
+
+install(TARGETS
+ kcm_ktp_chat_appearance
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+install(FILES
+ kcm_ktp_chat_appearance.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/config/appearance/Messages.sh b/config/appearance/Messages.sh
new file mode 100755
index 0000000..bb41eb7
--- /dev/null
+++ b/config/appearance/Messages.sh
@@ -0,0 +1,4 @@
+#! /usr/bin/env bash
+$EXTRACTRC `find . -name \*.ui -o -name \*.rc -o -name \*.kcfg` >> rc.cpp || exit 11
+$XGETTEXT `find . -name \*.cpp` -o $podir/kcm_ktp_chat_appearance.pot
+rm -f rc.cpp
diff --git a/config/appearance-config-tab.cpp b/config/appearance/appearance-config-tab.cpp
similarity index 100%
rename from config/appearance-config-tab.cpp
rename to config/appearance/appearance-config-tab.cpp
diff --git a/config/appearance-config-tab.h b/config/appearance/appearance-config-tab.h
similarity index 100%
rename from config/appearance-config-tab.h
rename to config/appearance/appearance-config-tab.h
diff --git a/config/appearance-config.cpp b/config/appearance/appearance-config.cpp
similarity index 100%
rename from config/appearance-config.cpp
rename to config/appearance/appearance-config.cpp
diff --git a/config/appearance-config.h b/config/appearance/appearance-config.h
similarity index 100%
rename from config/appearance-config.h
rename to config/appearance/appearance-config.h
diff --git a/config/appearance-config.ui b/config/appearance/appearance-config.ui
similarity index 100%
rename from config/appearance-config.ui
rename to config/appearance/appearance-config.ui
diff --git a/config/kcm_ktp_chat_appearance.desktop b/config/appearance/kcm_ktp_chat_appearance.desktop
similarity index 100%
rename from config/kcm_ktp_chat_appearance.desktop
rename to config/appearance/kcm_ktp_chat_appearance.desktop
diff --git a/config/behavior/CMakeLists.txt b/config/behavior/CMakeLists.txt
new file mode 100644
index 0000000..2553355
--- /dev/null
+++ b/config/behavior/CMakeLists.txt
@@ -0,0 +1,23 @@
+add_definitions(-DTRANSLATION_DOMAIN=\"kcm_ktp_chat_behavior\")
+
+set(kcm_ktp_chat_behavior_SRCS behavior-config.cpp)
+set(kcm_ktp_chat_behavior_UI behavior-config.ui)
+
+ki18n_wrap_ui(kcm_ktp_chat_behavior_SRCS ${kcm_ktp_chat_behavior_UI})
+add_library(kcm_ktp_chat_behavior MODULE ${kcm_ktp_chat_behavior_SRCS})
+
+target_link_libraries(kcm_ktp_chat_behavior
+ KF5::TextWidgets
+ KF5::KCMUtils
+ ktpchat
+ ktpimagesharer
+)
+
+install(TARGETS
+ kcm_ktp_chat_behavior
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+install(FILES
+ kcm_ktp_chat_behavior.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/config/behavior/Messages.sh b/config/behavior/Messages.sh
new file mode 100755
index 0000000..2e162bc
--- /dev/null
+++ b/config/behavior/Messages.sh
@@ -0,0 +1,4 @@
+#! /usr/bin/env bash
+$EXTRACTRC `find . -name \*.ui -o -name \*.rc -o -name \*.kcfg` >> rc.cpp || exit 11
+$XGETTEXT `find . -name \*.cpp` -o $podir/kcm_ktp_chat_behaviour.pot
+rm -f rc.cpp
diff --git a/config/behavior-config.cpp b/config/behavior/behavior-config.cpp
similarity index 100%
rename from config/behavior-config.cpp
rename to config/behavior/behavior-config.cpp
diff --git a/config/behavior-config.h b/config/behavior/behavior-config.h
similarity index 100%
rename from config/behavior-config.h
rename to config/behavior/behavior-config.h
diff --git a/config/behavior-config.ui b/config/behavior/behavior-config.ui
similarity index 100%
rename from config/behavior-config.ui
rename to config/behavior/behavior-config.ui
diff --git a/config/kcm_ktp_chat_behavior.desktop b/config/behavior/kcm_ktp_chat_behavior.desktop
similarity index 100%
rename from config/kcm_ktp_chat_behavior.desktop
rename to config/behavior/kcm_ktp_chat_behavior.desktop
diff --git a/config/messages/CMakeLists.txt b/config/messages/CMakeLists.txt
new file mode 100644
index 0000000..43a3b6f
--- /dev/null
+++ b/config/messages/CMakeLists.txt
@@ -0,0 +1,20 @@
+add_definitions(-DTRANSLATION_DOMAIN=\"kcm_ktp_chat_messages\")
+
+set(kcm_ktp_chat_messages_SRCS messages-config.cpp)
+
+add_library(kcm_ktp_chat_messages MODULE ${kcm_ktp_chat_messages_SRCS})
+
+target_link_libraries(kcm_ktp_chat_messages
+ KF5::KCMUtils
+ KTp::CommonInternals
+ ktpchat
+)
+
+install(TARGETS
+ kcm_ktp_chat_messages
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+install(FILES
+ kcm_ktp_chat_messages.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/config/messages/Messages.sh b/config/messages/Messages.sh
new file mode 100755
index 0000000..a14f576
--- /dev/null
+++ b/config/messages/Messages.sh
@@ -0,0 +1,2 @@
+#! /usr/bin/env bash
+$XGETTEXT `find . -name \*.cpp` -o $podir/kcm_ktp_chat_messages.pot
diff --git a/config/kcm_ktp_chat_messages.desktop b/config/messages/kcm_ktp_chat_messages.desktop
similarity index 100%
rename from config/kcm_ktp_chat_messages.desktop
rename to config/messages/kcm_ktp_chat_messages.desktop
diff --git a/config/messages-config.cpp b/config/messages/messages-config.cpp
similarity index 100%
rename from config/messages-config.cpp
rename to config/messages/messages-config.cpp
diff --git a/config/messages-config.h b/config/messages/messages-config.h
similarity index 100%
rename from config/messages-config.h
rename to config/messages/messages-config.h
diff --git a/config/otr/CMakeLists.txt b/config/otr/CMakeLists.txt
new file mode 100644
index 0000000..8e8ced6
--- /dev/null
+++ b/config/otr/CMakeLists.txt
@@ -0,0 +1,24 @@
+add_definitions(-DTRANSLATION_DOMAIN=\"kcm_ktp_chat_otr\")
+
+set(kcm_ktp_chat_otr_SRCS otr-config.cpp)
+set(kcm_ktp_chat_otr_UI otr-config.ui)
+
+ki18n_wrap_ui(kcm_ktp_chat_otr_SRCS ${kcm_ktp_chat_otr_UI})
+add_library(kcm_ktp_chat_otr MODULE ${kcm_ktp_chat_otr_SRCS})
+
+target_link_libraries(kcm_ktp_chat_otr
+ KF5::KCMUtils
+ KF5::WidgetsAddons
+ KTp::CommonInternals
+ KTp::OTR
+ ktpchat
+)
+
+install(TARGETS
+ kcm_ktp_chat_otr
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+install(FILES
+ kcm_ktp_chat_otr.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/config/otr/Messages.sh b/config/otr/Messages.sh
new file mode 100755
index 0000000..642811e
--- /dev/null
+++ b/config/otr/Messages.sh
@@ -0,0 +1,4 @@
+#! /usr/bin/env bash
+$EXTRACTRC `find . -name \*.ui -o -name \*.rc -o -name \*.kcfg` >> rc.cpp || exit 11
+$XGETTEXT `find . -name \*.cpp` -o $podir/kcm_ktp_chat_otr.pot
+rm -f rc.cpp
diff --git a/config/kcm_ktp_chat_otr.desktop b/config/otr/kcm_ktp_chat_otr.desktop
similarity index 100%
rename from config/kcm_ktp_chat_otr.desktop
rename to config/otr/kcm_ktp_chat_otr.desktop
diff --git a/config/otr-config.cpp b/config/otr/otr-config.cpp
similarity index 100%
rename from config/otr-config.cpp
rename to config/otr/otr-config.cpp
diff --git a/config/otr-config.h b/config/otr/otr-config.h
similarity index 100%
rename from config/otr-config.h
rename to config/otr/otr-config.h
diff --git a/config/otr-config.ui b/config/otr/otr-config.ui
similarity index 100%
rename from config/otr-config.ui
rename to config/otr/otr-config.ui
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list