summaryrefslogtreecommitdiffstats
path: root/kmag
diff options
context:
space:
mode:
authorgregory guy <gregory-tde@laposte.net>2020-03-29 19:41:28 +0200
committergregory guy <gregory-tde@laposte.net>2021-01-26 11:52:09 +0100
commit6b3181cf92f1fc74da1e8a82f690a1526cb4e900 (patch)
treeb2bcaa0683427ddc2a1d692870d731c238f6cce8 /kmag
parente09ebe446c909827c78f7c6d76b94ce4adea139d (diff)
downloadtdeaccessibility-6b3181cf92f1fc74da1e8a82f690a1526cb4e900.tar.gz
tdeaccessibility-6b3181cf92f1fc74da1e8a82f690a1526cb4e900.zip
Conversion to the cmake building system.
Added several man pages taken from the Debian packaging. Cleanup headers in ui files. Add png icons for mono theme. Signed-off-by: gregory guy <gregory-tde@laposte.net> cmake: - Use tde_add_check_executable instead of a combination of separate calls to tde_add_executable and add_test. - Simplify the detection of time.h and sys/time.h headers. - Refactor phrasebook files install, kmouth. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'kmag')
-rw-r--r--kmag/CMakeLists.txt49
-rw-r--r--kmag/Makefile.am4
-rw-r--r--kmag/images/CMakeLists.txt3
-rw-r--r--kmag/images/Makefile.am3
-rw-r--r--kmag/images/hi16-action-followmouse.png (renamed from kmag/hi16-action-followmouse.png)bin575 -> 575 bytes
-rw-r--r--kmag/images/hi16-action-hidemouse.png (renamed from kmag/hi16-action-hidemouse.png)bin275 -> 275 bytes
-rw-r--r--kmag/images/hi16-action-window.png (renamed from kmag/hi16-action-window.png)bin314 -> 314 bytes
-rw-r--r--kmag/kmag.h3
-rw-r--r--kmag/kmagzoomview.h2
9 files changed, 58 insertions, 6 deletions
diff --git a/kmag/CMakeLists.txt b/kmag/CMakeLists.txt
new file mode 100644
index 0000000..70fccec
--- /dev/null
+++ b/kmag/CMakeLists.txt
@@ -0,0 +1,49 @@
+add_subdirectory( images )
+
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${X11_INCLUDE_DIR}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIB_DIR}
+)
+
+
+##### kmag (executable)
+
+tde_add_executable( kmag AUTOMOC
+
+ SOURCES
+ kmagzoomview.cpp
+ kmagselrect.cpp
+ kmag.cpp
+ main.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ tdeio-shared
+ tdeprint-shared
+
+ DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### icons
+
+tde_install_icons( kmag )
+
+
+##### other data
+
+install(
+ FILES kmagui.rc
+ DESTINATION ${DATA_INSTALL_DIR}/kmag
+)
+
+tde_create_translated_desktop( kmag.desktop )
diff --git a/kmag/Makefile.am b/kmag/Makefile.am
index 1ecf6db..678b69e 100644
--- a/kmag/Makefile.am
+++ b/kmag/Makefile.am
@@ -15,9 +15,6 @@ KDE_ICON = kmag
xdg_apps_DATA = kmag.desktop
-kmagiconsdir = $(kde_datadir)/kmag/icons
-kmagicons_ICON = followmouse hidemouse window
-
# set the include path for X, qt and KDE
INCLUDES= $(all_includes)
@@ -37,3 +34,4 @@ messages: rc.cpp
$(XGETTEXT) $$LIST -o $(podir)/kmag.pot; \
fi
+SUBDIRS = images
diff --git a/kmag/images/CMakeLists.txt b/kmag/images/CMakeLists.txt
new file mode 100644
index 0000000..b2c3d3f
--- /dev/null
+++ b/kmag/images/CMakeLists.txt
@@ -0,0 +1,3 @@
+##### icons
+
+tde_install_icons( DESTINATION ${DATA_INSTALL_DIR}/kmag/icons )
diff --git a/kmag/images/Makefile.am b/kmag/images/Makefile.am
new file mode 100644
index 0000000..336246b
--- /dev/null
+++ b/kmag/images/Makefile.am
@@ -0,0 +1,3 @@
+
+kmagiconsdir = $(kde_datadir)/kmag/icons
+kmagicons_ICON = followmouse hidemouse window
diff --git a/kmag/hi16-action-followmouse.png b/kmag/images/hi16-action-followmouse.png
index 1b690e8..1b690e8 100644
--- a/kmag/hi16-action-followmouse.png
+++ b/kmag/images/hi16-action-followmouse.png
Binary files differ
diff --git a/kmag/hi16-action-hidemouse.png b/kmag/images/hi16-action-hidemouse.png
index b792f7d..b792f7d 100644
--- a/kmag/hi16-action-hidemouse.png
+++ b/kmag/images/hi16-action-hidemouse.png
Binary files differ
diff --git a/kmag/hi16-action-window.png b/kmag/images/hi16-action-window.png
index 1563cca..1563cca 100644
--- a/kmag/hi16-action-window.png
+++ b/kmag/images/hi16-action-window.png
Binary files differ
diff --git a/kmag/kmag.h b/kmag/kmag.h
index 10a85a1..c60b86c 100644
--- a/kmag/kmag.h
+++ b/kmag/kmag.h
@@ -21,9 +21,8 @@
#ifndef KMAG_H
#define KMAG_H
-
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
#include "kmagzoomview.h"
diff --git a/kmag/kmagzoomview.h b/kmag/kmagzoomview.h
index 1208d18..b82dc47 100644
--- a/kmag/kmagzoomview.h
+++ b/kmag/kmagzoomview.h
@@ -21,7 +21,7 @@
#define KMagZoomView_h_
#ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
#endif
// include files for TQt