Conversion to the cmake building system.

Add includes to UI files to resolve FTBFS.

Signed-off-by: gregory guy <[email protected]>
Signed-off-by: Slávek Banko <[email protected]>

16 files changed, 150 insertions, 90 deletions

diff --git a/ktouch/CMakeLists.txt b/ktouch/CMakeLists.txt
new file mode 100644
index 00000000..0c1ecf7d
--- /dev/null
+++ b/ktouch/CMakeLists.txt
@@ -0,0 +1,15 @@
+add_subdirectory( src       )
+add_subdirectory( keyboards )
+add_subdirectory( training  )
+add_subdirectory( sounds    )
+add_subdirectory( graphics  )
+add_subdirectory( icons     )
+#add_subdirectory( extras    )
+
+
+##### other data
+
+install(
+    FILES ktouch.desktop
+    DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
diff --git a/ktouch/graphics/CMakeLists.txt b/ktouch/graphics/CMakeLists.txt
new file mode 100644
index 00000000..ea42ac50
--- /dev/null
+++ b/ktouch/graphics/CMakeLists.txt
@@ -0,0 +1,4 @@
+install(
+    FILES splash.png
+    DESTINATION ${DATA_INSTALL_DIR}/ktouch
+)
diff --git a/ktouch/icons/CMakeLists.txt b/ktouch/icons/CMakeLists.txt
new file mode 100644
index 00000000..63f765b3
--- /dev/null
+++ b/ktouch/icons/CMakeLists.txt
@@ -0,0 +1 @@
+tde_install_icons( )
diff --git a/ktouch/keyboards/CMakeLists.txt b/ktouch/keyboards/CMakeLists.txt
new file mode 100644
index 00000000..0c769766
--- /dev/null
+++ b/ktouch/keyboards/CMakeLists.txt
@@ -0,0 +1,6 @@
+file( GLOB _kbds RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.keyboard )
+
+install(
+    FILES ${_kbds}
+    DESTINATION ${DATA_INSTALL_DIR}/ktouch
+)
diff --git a/ktouch/sounds/CMakeLists.txt b/ktouch/sounds/CMakeLists.txt
new file mode 100644
index 00000000..1281ffcb
--- /dev/null
+++ b/ktouch/sounds/CMakeLists.txt
@@ -0,0 +1,8 @@
+install(
+    FILES
+        up.wav
+        down.wav
+        typewriter.wav
+
+  DESTINATION ${DATA_INSTALL_DIR}/ktouch
+)
diff --git a/ktouch/src/CMakeLists.txt b/ktouch/src/CMakeLists.txt
new file mode 100644
index 00000000..26dacfc2
--- /dev/null
+++ b/ktouch/src/CMakeLists.txt
@@ -0,0 +1,71 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### ktouch (executable)
+
+tde_add_executable( ktouch AUTOMOC
+
+  SOURCES
+        ktouchcoloreditor_dlg.ui
+        ktouchlectureeditor_dlg.ui
+        ktouchopenrequest_dlg.ui
+        ktouchprefcolorslayout.ui
+        ktouchprefgenerallayout.ui
+        ktouchprefkeyboardlayout.ui
+        ktouchpreftraininglayout.ui
+        ktouchstatistics_dlg.ui
+        ktouchstatuslayout.ui
+        prefs.kcfgc
+        ktouchchartwidget.cpp
+        ktouchcolorscheme.cpp
+        ktouch.cpp
+        ktouchdefaults.cpp
+        ktouchkeyboardwidget.cpp
+        ktouchkeyconnector.cpp
+        ktouchkey.cpp
+        ktouchkeys.cpp
+        ktouchlecture.cpp
+        ktouchlectureeditor.cpp
+        ktouchleveldata.cpp
+        ktouchopenrequest.cpp
+        ktouchslideline.cpp
+        ktouchstatistics.cpp
+        ktouchstatisticsdata.cpp
+        ktouchstatus.cpp
+        ktouchtrainer.cpp
+        ktouchutils.cpp
+        main.cpp
+        ktouchcoloreditor.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     tdeeduplot-shared
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES ktouchui.rc
+    DESTINATION ${DATA_INSTALL_DIR}/ktouch
+)
+
+install(
+    FILES ktouch.kcfg
+    DESTINATION ${KCFG_INSTALL_DIR}
+)
diff --git a/ktouch/src/ktouchcoloreditor_dlg.ui b/ktouch/src/ktouchcoloreditor_dlg.ui
index 38245a56..5f1918c3 100644
--- a/ktouch/src/ktouchcoloreditor_dlg.ui
+++ b/ktouch/src/ktouchcoloreditor_dlg.ui
@@ -793,32 +793,9 @@
     <slot>colorSchemeChanged(TQListBoxItem * item)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+</includes>
 </UI>
diff --git a/ktouch/src/ktouchkeyboardeditor_dlg.ui b/ktouch/src/ktouchkeyboardeditor_dlg.ui
index 81d532a7..741f4e20 100644
--- a/ktouch/src/ktouchkeyboardeditor_dlg.ui
+++ b/ktouch/src/ktouchkeyboardeditor_dlg.ui
@@ -390,17 +390,9 @@
     <slot>keySelectionChanged(TQListBoxItem*)</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>ktextedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">ktextedit.h</include>
+</includes>
 </UI>
diff --git a/ktouch/src/ktouchlectureeditor_dlg.ui b/ktouch/src/ktouchlectureeditor_dlg.ui
index 83105f4c..d5f0f888 100644
--- a/ktouch/src/ktouchlectureeditor_dlg.ui
+++ b/ktouch/src/ktouchlectureeditor_dlg.ui
@@ -665,20 +665,10 @@
     <slot>fontBtnClicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>ktextedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">ktextedit.h</include>
+    <include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/ktouch/src/ktouchopenrequest_dlg.ui b/ktouch/src/ktouchopenrequest_dlg.ui
index 4da33c33..410353dc 100644
--- a/ktouch/src/ktouchopenrequest_dlg.ui
+++ b/ktouch/src/ktouchopenrequest_dlg.ui
@@ -279,11 +279,9 @@
     <slot>browseBtnClicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>ksqueezedtextlabel.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">ksqueezedtextlabel.h</include>
+</includes>
 </UI>
diff --git a/ktouch/src/ktouchprefcolorslayout.ui b/ktouch/src/ktouchprefcolorslayout.ui
index 6fd8eeea..debe5f46 100644
--- a/ktouch/src/ktouchprefcolorslayout.ui
+++ b/ktouch/src/ktouchprefcolorslayout.ui
@@ -505,12 +505,7 @@
     <tabstop>kcfg_CurrentColorScheme</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+</includes>
 </UI>
diff --git a/ktouch/src/ktouchprefgenerallayout.ui b/ktouch/src/ktouchprefgenerallayout.ui
index 96ed2bff..6bbc0d4c 100644
--- a/ktouch/src/ktouchprefgenerallayout.ui
+++ b/ktouch/src/ktouchprefgenerallayout.ui
@@ -335,7 +335,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdefontrequester.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdefontrequester.h</include>
+</includes>
 </UI>
diff --git a/ktouch/src/ktouchprefkeyboardlayout.ui b/ktouch/src/ktouchprefkeyboardlayout.ui
index 949207cc..75cef9e1 100644
--- a/ktouch/src/ktouchprefkeyboardlayout.ui
+++ b/ktouch/src/ktouchprefkeyboardlayout.ui
@@ -136,7 +136,7 @@
     <slot>fontChooseBtnClicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdefontrequester.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">tdefontrequester.h</include>
+</includes>
 </UI>
diff --git a/ktouch/src/ktouchpreftraininglayout.ui b/ktouch/src/ktouchpreftraininglayout.ui
index 3c6a1c8d..f36a6a80 100644
--- a/ktouch/src/ktouchpreftraininglayout.ui
+++ b/ktouch/src/ktouchpreftraininglayout.ui
@@ -322,10 +322,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">knuminput.h</include>
+</includes>
 </UI>
diff --git a/ktouch/src/ktouchstatistics_dlg.ui b/ktouch/src/ktouchstatistics_dlg.ui
index a254c9af..bcfeb9fd 100644
--- a/ktouch/src/ktouchstatistics_dlg.ui
+++ b/ktouch/src/ktouchstatistics_dlg.ui
@@ -1278,10 +1278,10 @@
     </image>
 </images>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>ktouchchartwidget.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+    <include location="global" impldecl="in implementation">ktouchchartwidget.h</include>
+    <include location="global" impldecl="in implementation">kcolorbutton.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/ktouch/training/CMakeLists.txt b/ktouch/training/CMakeLists.txt
new file mode 100644
index 00000000..a3b25923
--- /dev/null
+++ b/ktouch/training/CMakeLists.txt
@@ -0,0 +1,6 @@
+file( GLOB _xmls RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.xml )
+
+install(
+    FILES ${_xmls}
+    DESTINATION ${DATA_INSTALL_DIR}/ktouch
+)