13 files changed, 183 insertions, 161 deletions
diff --git a/ksayit/CMakeL10n.txt b/ksayit/CMakeL10n.txt
index b585ce4..0d6145b 100644
--- a/ksayit/CMakeL10n.txt
+++ b/ksayit/CMakeL10n.txt
@@ -1,3 +1,11 @@
 ##### create translation templates ##############
 
 tde_l10n_auto_add_subdirectories( )
+
+tde_l10n_create_template(
+	CATALOG "desktop_files/ksayit-desktops/"
+	SOURCES
+		src/*.desktop
+		*.desktop
+	DESTINATION "${CMAKE_SOURCE_DIR}/translations"
+)
diff --git a/ksayit/CMakeLists.txt b/ksayit/CMakeLists.txt
new file mode 100644
index 0000000..3104aec
--- /dev/null
+++ b/ksayit/CMakeLists.txt
@@ -0,0 +1,3 @@
+tde_conditional_add_subdirectory( BUILD_KSAYIT_FREEVERB Freeverb_plugin )
+add_subdirectory( KTTSD_Lib )
+add_subdirectory( src )
diff --git a/ksayit/Freeverb_plugin/CMakeLists.txt b/ksayit/Freeverb_plugin/CMakeLists.txt
new file mode 100644
index 0000000..ed4a7cd
--- /dev/null
+++ b/ksayit/Freeverb_plugin/CMakeLists.txt
@@ -0,0 +1,46 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/ksayit/src
+  ${ARTS_MODULES_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+##### libFreeverb_plugin (module)
+
+tde_add_library( libFreeverb_plugin MODULE AUTOMOC
+
+  SOURCES
+        freeverb_setup.ui
+        freeverbsetupimpl.cpp
+        ksayitfreeverblib.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     ${ARTS_FREEVERB_PLUGIN_LIBRARIES}
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE ksayit_libFreeverb_service.desktop
+    DESTINATION ${SERVICETYPES_INSTALL_DIR}
+    PO_DIR ksayit-desktops
+)
+
+tde_create_translated_desktop(
+    SOURCE ksayit_libFreeverb.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+    PO_DIR ksayit-desktops
+)
diff --git a/ksayit/Freeverb_plugin/freeverb_setup.ui b/ksayit/Freeverb_plugin/freeverb_setup.ui
index 7cd1a02..5474e16 100644
--- a/ksayit/Freeverb_plugin/freeverb_setup.ui
+++ b/ksayit/Freeverb_plugin/freeverb_setup.ui
@@ -662,7 +662,7 @@
     <slot>slotOKwasClicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/ksayit/Freeverb_plugin/kdeexportfix.h b/ksayit/Freeverb_plugin/kdeexportfix.h
index a30f3d5..958dd20 100644
--- a/ksayit/Freeverb_plugin/kdeexportfix.h
+++ b/ksayit/Freeverb_plugin/kdeexportfix.h
@@ -1,4 +1,4 @@
-/***************************************************** vim:set ts=4 sw=4 sts=4:
+/*
   tdelibs < 3.3.2 had a bug in the KDE_EXPORT macro.  This file fixes this
   by undefining it.
   -------------------
diff --git a/ksayit/Freeverb_plugin/ksayit_libFreeverb.desktop b/ksayit/Freeverb_plugin/ksayit_libFreeverb.desktop
index 9e42bef..15e51d9 100644
--- a/ksayit/Freeverb_plugin/ksayit_libFreeverb.desktop
+++ b/ksayit/Freeverb_plugin/ksayit_libFreeverb.desktop
@@ -1,52 +1,8 @@
 [Desktop Entry]
 Name=Freeverb
-Name[ne]=फ्रीभर्व
-Name[vi]=Động từ tự do
+
 Comment=A Freeverb Plugin for KSayIt
-Comment[bg]=Приставка Freeverb за KTTSD
-Comment[br]=Lugent Freeverb evit KSayIt
-Comment[ca]=Un connector de Freeverb pel KSayit
-Comment[cs]=Freeverb modul pro KSayIt
-Comment[da]=Et Freeverb plugin for KSayIt
-Comment[de]=Ein Freeverb-Modul für KSayIt
-Comment[el]=Ένα πρόσθετο Freeverb για το KTTSD
-Comment[es]=Complemento Freeverb para KSayIt
-Comment[et]=KSayIt'i Freeverbi plugin
-Comment[eu]=KSayIt-en Freeverb plugina
-Comment[fa]=وصلۀ Freever برای KSaylt
-Comment[fi]=Freeverb-liitännäinen KSayIt--ohjelmalle
-Comment[fr]=Un module Freeverb pour KSayIt
-Comment[ga]=Breiseán Freeverb le haghaidh KSayIt
-Comment[gl]=Un Plugin de Freeverb para KSayIt
-Comment[he]=תוסף Freeverb עבור KSayIt
-Comment[hu]=Freeverb modul a KSayIt programhoz
-Comment[is]=Freeverb íforrit fyrir KSayIt
-Comment[it]=Un plugin per Freeverb per KTTSD
-Comment[ja]=KSayIt 用 Freeverb プラグイン
-Comment[ka]=KSayIt Freeverb მოდული
-Comment[km]= កម្មវិធីជំនួយ Freeverb សម្រាប់ KSayIt
-Comment[lt]=Freeverb priedas skirtas KSayIt
-Comment[mk]=Freeverb-приклучок за Ksaylt
-Comment[nb]=Et Freeverb programtillegg for KSayIt
-Comment[nds]=En Freeverb-Moduul för KSayIt
-Comment[ne]=के से इटका लागि एउटा फ्रिभर्व प्लगइन
-Comment[nl]=Een Freeverb-plugin vor KSayIt
-Comment[pa]=KSayIt ਲਈ ਮੁਕਤ-ਵਰਬ ਪਲੱਗਿੰਨ
-Comment[pl]=Wtyczka Freeverb dla KSayIt
-Comment[pt]='Plugin' de Reverberação para o KTTSD
-Comment[pt_BR]=Plug-in do Freeverb para o KSayIt
-Comment[ru]=Модуль Freeverb для KSayIt
-Comment[sk]=Modul Freeverb pre PovedzTo
-Comment[sl]=Vstavek Freeverb za KSayIt
-Comment[sr]=Freeverb прикључак за KSayIt
-Comment[sr@Latn]=Freeverb priključak za KSayIt
-Comment[sv]=Freeverb-insticksprogram för Ksayit
-Comment[tg]=Модули Freeverb барои KSayIt
-Comment[tr]=Ksayit için Freeverb Eklentisi
-Comment[uk]=Втулок Freeverb для KSayIt
-Comment[vi]=Trình bổ sung "Động từ tự do" cho "Nói K"
-Comment[zh_CN]=KSayIt 的 Freeverb 插件
-Comment[zh_TW]=KSayIt 的 Freeverb 外掛程式
-X-TDE-ServiceTypes=KSayIt/FXPlugin
+
 Type=Service
+X-TDE-ServiceTypes=KSayIt/FXPlugin
 X-TDE-Library=libFreeverb_plugin
diff --git a/ksayit/Freeverb_plugin/ksayit_libFreeverb_service.desktop b/ksayit/Freeverb_plugin/ksayit_libFreeverb_service.desktop
index 162baa5..c524094 100644
--- a/ksayit/Freeverb_plugin/ksayit_libFreeverb_service.desktop
+++ b/ksayit/Freeverb_plugin/ksayit_libFreeverb_service.desktop
@@ -1,48 +1,5 @@
 [Desktop Entry]
+Comment=A Freeverb Plugin for KSayIt
+
 Type=ServiceType
 X-TDE-ServiceType=KSayIt/FXPlugin
-Comment=A Freeverb Plugin for KSayIt
-Comment[bg]=Приставка Freeverb за KTTSD
-Comment[br]=Lugent Freeverb evit KSayIt
-Comment[ca]=Un connector de Freeverb pel KSayit
-Comment[cs]=Freeverb modul pro KSayIt
-Comment[da]=Et Freeverb plugin for KSayIt
-Comment[de]=Ein Freeverb-Modul für KSayIt
-Comment[el]=Ένα πρόσθετο Freeverb για το KTTSD
-Comment[es]=Complemento Freeverb para KSayIt
-Comment[et]=KSayIt'i Freeverbi plugin
-Comment[eu]=KSayIt-en Freeverb plugina
-Comment[fa]=وصلۀ Freever برای KSaylt
-Comment[fi]=Freeverb-liitännäinen KSayIt--ohjelmalle
-Comment[fr]=Un module Freeverb pour KSayIt
-Comment[ga]=Breiseán Freeverb le haghaidh KSayIt
-Comment[gl]=Un Plugin de Freeverb para KSayIt
-Comment[he]=תוסף Freeverb עבור KSayIt
-Comment[hu]=Freeverb modul a KSayIt programhoz
-Comment[is]=Freeverb íforrit fyrir KSayIt
-Comment[it]=Un plugin per Freeverb per KTTSD
-Comment[ja]=KSayIt 用 Freeverb プラグイン
-Comment[ka]=KSayIt Freeverb მოდული
-Comment[km]= កម្មវិធីជំនួយ Freeverb សម្រាប់ KSayIt
-Comment[lt]=Freeverb priedas skirtas KSayIt
-Comment[mk]=Freeverb-приклучок за Ksaylt
-Comment[nb]=Et Freeverb programtillegg for KSayIt
-Comment[nds]=En Freeverb-Moduul för KSayIt
-Comment[ne]=के से इटका लागि एउटा फ्रिभर्व प्लगइन
-Comment[nl]=Een Freeverb-plugin vor KSayIt
-Comment[pa]=KSayIt ਲਈ ਮੁਕਤ-ਵਰਬ ਪਲੱਗਿੰਨ
-Comment[pl]=Wtyczka Freeverb dla KSayIt
-Comment[pt]='Plugin' de Reverberação para o KTTSD
-Comment[pt_BR]=Plug-in do Freeverb para o KSayIt
-Comment[ru]=Модуль Freeverb для KSayIt
-Comment[sk]=Modul Freeverb pre PovedzTo
-Comment[sl]=Vstavek Freeverb za KSayIt
-Comment[sr]=Freeverb прикључак за KSayIt
-Comment[sr@Latn]=Freeverb priključak za KSayIt
-Comment[sv]=Freeverb-insticksprogram för Ksayit
-Comment[tg]=Модули Freeverb барои KSayIt
-Comment[tr]=Ksayit için Freeverb Eklentisi
-Comment[uk]=Втулок Freeverb для KSayIt
-Comment[vi]=Trình bổ sung "Động từ tự do" cho "Nói K"
-Comment[zh_CN]=KSayIt 的 Freeverb 插件
-Comment[zh_TW]=KSayIt 的 Freeverb 外掛程式
diff --git a/ksayit/KTTSD_Lib/CMakeLists.txt b/ksayit/KTTSD_Lib/CMakeLists.txt
new file mode 100644
index 0000000..511c22d
--- /dev/null
+++ b/ksayit/KTTSD_Lib/CMakeLists.txt
@@ -0,0 +1,34 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_BINARY_DIR}/kspeechsink
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### KTTSD_Lib (shared)
+
+tde_add_library( KTTSD_Lib SHARED AUTOMOC
+
+  SOURCES
+        KTTSDlibSetup.ui
+        kttsdlib.cpp
+        kttsdlibsetupimpl.cpp
+        kttsdlibtalker2.cpp
+  LINK
+     tdeui-shared
+     tdecore-shared
+     kspeech_stub-static
+
+  VERSION 0.0.1
+
+  DESTINATION ${LIB_INSTALL_DIR}
+)
diff --git a/ksayit/KTTSD_Lib/kdeexportfix.h b/ksayit/KTTSD_Lib/kdeexportfix.h
index a30f3d5..958dd20 100644
--- a/ksayit/KTTSD_Lib/kdeexportfix.h
+++ b/ksayit/KTTSD_Lib/kdeexportfix.h
@@ -1,4 +1,4 @@
-/***************************************************** vim:set ts=4 sw=4 sts=4:
+/*
   tdelibs < 3.3.2 had a bug in the KDE_EXPORT macro.  This file fixes this
   by undefining it.
   -------------------
diff --git a/ksayit/src/CMakeLists.txt b/ksayit/src/CMakeLists.txt
new file mode 100644
index 0000000..ecbaca8
--- /dev/null
+++ b/ksayit/src/CMakeLists.txt
@@ -0,0 +1,73 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/ksayit/KTTSD_Lib
+  ${KAYSAYIT_ARTS_INCLUDE}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### ksayit (executable)
+
+tde_add_executable( ksayit AUTOMOC
+
+  SOURCES
+        DocTreeView.ui
+        fx_setup.ui
+        KSayItView.ui
+        doctreeviewimpl.cpp
+        effectstack.cpp
+        fxpluginhandler.cpp
+        fxsetupimpl.cpp
+        ksayit.skel
+        ksayitsystemtray.cpp
+        ksayitviewimpl.cpp
+        main.cpp
+        voicesetupdlg.cpp
+        ksayit.cpp
+        parasaxparser.cpp
+        saxhandler.cpp
+        ksayitbookmarkhandler.cpp
+        contextmenuhandler.cpp
+        docbookclasses.cpp
+        docbookgenerator.cpp
+        docbookparser.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     KTTSD_Lib-shared
+     ${KAYSAYIT_ARTS_LIBRARIES}
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+##### icons
+
+tde_install_icons()
+
+
+##### other data
+
+install(
+    FILES ksayitui.rc ContextMenus.xml
+    DESTINATION ${DATA_INSTALL_DIR}/ksayit
+)
+
+tde_create_translated_desktop(
+    SOURCE ksayit.desktop
+    PO_DIR ksayit-desktops
+)
+
+install(
+    FILES ksayit_fxplugin.h
+    DESTINATION ${INCLUDE_INSTALL_DIR}
+)
diff --git a/ksayit/src/DocTreeView.ui b/ksayit/src/DocTreeView.ui
index 166b9b6..d66454e 100644
--- a/ksayit/src/DocTreeView.ui
+++ b/ksayit/src/DocTreeView.ui
@@ -121,6 +121,7 @@
 </forwards>
 <includes>
     <include location="local" impldecl="in implementation">DocTreeView.ui.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
 </includes>
 <Q_SIGNALS>
     <signal>signalContentChanged(const TQString &amp;)</signal>
@@ -155,7 +156,4 @@
     <slot>slotRightButtonPressed( TQListViewItem * i, const TQPoint &amp;, int )</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-</includehints>
 </UI>
diff --git a/ksayit/src/KSayItView.ui b/ksayit/src/KSayItView.ui
index 90d8332..a01f0af 100644
--- a/ksayit/src/KSayItView.ui
+++ b/ksayit/src/KSayItView.ui
@@ -63,7 +63,7 @@
     <slot>slotTextChanged()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>ktextedit.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">ktextedit.h</include>
+</includes>
 </UI>
diff --git a/ksayit/src/ksayit.desktop b/ksayit/src/ksayit.desktop
index 6a0fd4d..d958248 100644
--- a/ksayit/src/ksayit.desktop
+++ b/ksayit/src/ksayit.desktop
@@ -1,64 +1,11 @@
 [Desktop Entry]
+Name=KSayIt
+
+GenericName=Text-to-Speech Frontend
+
 Type=Application
 Exec=ksayit -caption "%c" %i
 Icon=ksayit
-X-DocPath=ksayit/index.html
 Terminal=false
-Name=KSayIt
-Name[hi]=के-से-इट
-Name[mk]=KSaylt
-Name[ne]=के से इट
-Name[sk]=PovedzTo
-Name[sv]=Ksayit
-Name[tg]=KSayIt
-Name[tr]=Ksayit
-Name[vi]=Nói K
-GenericName=Text-to-Speech Frontend
-GenericName[bg]=Синтез на глас
-GenericName[bs]=Program za izgovaranje teksta
-GenericName[ca]=Frontal per text a veu
-GenericName[cs]=Rozhraní hlasové syntézy
-GenericName[da]=Forende for tekst-til-tale
-GenericName[de]=Oberfläche für die Sprachausgabe
-GenericName[el]=Μετατροπή κειμένου σε ομιλία
-GenericName[es]=Interfaz de administración del sistema de texto a voz de TDE
-GenericName[et]=Teksti kõneks muutmine
-GenericName[eu]=Testutik hizketarako interfazea
-GenericName[fa]=پایانۀ متن به گفتار
-GenericName[fi]=Teksti puheeksi käyttöliittymä
-GenericName[fr]=Interface pour la synthèse vocale
-GenericName[ga]=Comhéadan Téacs-go-Caint
-GenericName[gl]=Interface de Texto-para-Fala
-GenericName[hu]=Szövegfelolvasó
-GenericName[is]=Texti-í-tal myndrænt viðmót
-GenericName[it]=Interfaccia di pronuncia
-GenericName[ja]=テキスト読み上げフロントエンド
-GenericName[ka]=ტექსტი-გახმოვანების ინტერფეისი
-GenericName[km]=ផ្នែកខាងមុខអត្ថបទដែលត្រូវនិយាយ
-GenericName[lt]=Teksto vertimo kalba naudotojo sąsaja
-GenericName[mk]=Преден дел за текст-во-говор
-GenericName[ms]=Antaramuka Teks-ke-Tutur
-GenericName[mt]=Programm għal Test-għal-Vuċi
-GenericName[nb]=Brukerflate for tekst til tale
-GenericName[nds]=Böversiet för den Vörleser
-GenericName[ne]=पाठ वाचक फ्रन्टइन्ड
-GenericName[nl]=Tekst-tot-spraak-schil
-GenericName[pa]=ਪਾਠ ਤੋਂ ਬੋਲੀ ਮੁੱਖ
-GenericName[pl]=Program obsługujący syntezator mowy
-GenericName[pt]=Interface de Texto para Fala
-GenericName[pt_BR]=Interface para a Conversão de Texto para Fala
-GenericName[ru]=Интерфейс к средствам синтеза речи
-GenericName[sk]=Rozhranie text-na-reč
-GenericName[sl]=Vmesnik »besedila v govor«
-GenericName[sr]=Интерфејс за текст-у-говор
-GenericName[sr@Latn]=Interfejs za tekst-u-govor
-GenericName[sv]=Text-till-tal gränssnitt
-GenericName[ta]=பேச்சில் இருந்து உரை முன்னணி
-GenericName[tg]=Интерфейс барои таҳлили овоз
-GenericName[th]=ฟร้อนเอนด์แปลงข้อความเป็นคำพูด
-GenericName[tr]= Metinden Konuşmaya Önyüzü
-GenericName[uk]=Інтерфейс синтезу мовлення з тексту
-GenericName[vi]=Giao diện chuyển Văn bản thành Tiếng nói
-GenericName[zh_CN]=文本到语音前端
-GenericName[zh_TW]=文字轉語音前端程式
+X-DocPath=ksayit/index.html
 Categories=Qt;TDE;Accessibility;Utility;