aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Whiting <jpwhiting@kde.org>2015-09-01 17:43:11 (GMT)
committerJeremy Whiting <jpwhiting@kde.org>2015-09-01 17:43:11 (GMT)
commit96346a6081db4f8f7e802f158973cd396943b245 (patch)
tree08594d8cb20e23792f2b19cd0f8e8836758e6144
parent21572d960420523e4ca8e19bb7600cd6b553c16d (diff)
Rename icons and fix src/CMakeLists.txt so cmake can configure.
-rw-r--r--icons/128-apps-ktouch.png (renamed from icons/hi128-app-ktouch.png)bin7031 -> 7031 bytes
-rw-r--r--icons/16-apps-ktouch.png (renamed from icons/hi16-app-ktouch.png)bin656 -> 656 bytes
-rw-r--r--icons/22-apps-ktouch.png (renamed from icons/hi22-app-ktouch.png)bin947 -> 947 bytes
-rw-r--r--icons/32-apps-ktouch.png (renamed from icons/hi32-app-ktouch.png)bin1409 -> 1409 bytes
-rw-r--r--icons/48-apps-ktouch.png (renamed from icons/hi48-app-ktouch.png)bin2239 -> 2239 bytes
-rw-r--r--icons/CMakeLists.txt12
-rw-r--r--icons/sc-apps-ktouch.svgz (renamed from icons/hisc-app-ktouch.svgz)bin5344 -> 5344 bytes
-rw-r--r--src/CMakeLists.txt13
8 files changed, 14 insertions, 11 deletions
diff --git a/icons/hi128-app-ktouch.png b/icons/128-apps-ktouch.png
index 7d628af..7d628af 100644
--- a/icons/hi128-app-ktouch.png
+++ b/icons/128-apps-ktouch.png
Binary files differ
diff --git a/icons/hi16-app-ktouch.png b/icons/16-apps-ktouch.png
index 4f640cb..4f640cb 100644
--- a/icons/hi16-app-ktouch.png
+++ b/icons/16-apps-ktouch.png
Binary files differ
diff --git a/icons/hi22-app-ktouch.png b/icons/22-apps-ktouch.png
index 530d3df..530d3df 100644
--- a/icons/hi22-app-ktouch.png
+++ b/icons/22-apps-ktouch.png
Binary files differ
diff --git a/icons/hi32-app-ktouch.png b/icons/32-apps-ktouch.png
index 97e6602..97e6602 100644
--- a/icons/hi32-app-ktouch.png
+++ b/icons/32-apps-ktouch.png
Binary files differ
diff --git a/icons/hi48-app-ktouch.png b/icons/48-apps-ktouch.png
index c5666a4..c5666a4 100644
--- a/icons/hi48-app-ktouch.png
+++ b/icons/48-apps-ktouch.png
Binary files differ
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 3d08a0f..b5acb6c 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -1,11 +1,11 @@
ecm_install_icons(
ICONS
- hi16-app-ktouch.png
- hi22-app-ktouch.png
- hi32-app-ktouch.png
- hi48-app-ktouch.png
- hi128-app-ktouch.png
- hisc-app-ktouch.svgz
+ 16-apps-ktouch.png
+ 22-apps-ktouch.png
+ 32-apps-ktouch.png
+ 48-apps-ktouch.png
+ 128-apps-ktouch.png
+ sc-apps-ktouch.svgz
DESTINATION ${ICON_INSTALL_DIR}
THEME hicolor
)
diff --git a/icons/hisc-app-ktouch.svgz b/icons/sc-apps-ktouch.svgz
index 07dd8de..07dd8de 100644
--- a/icons/hisc-app-ktouch.svgz
+++ b/icons/sc-apps-ktouch.svgz
Binary files differ
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 44b99b7..edb1cde 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -108,6 +108,13 @@ kconfig_add_kcfg_files(ktouch_SRCS preferences.kcfgc)
add_executable(ktouch ${ktouch_SRCS})
+set(ktouch_X11_DEPS "")
+
+if (X11_Xkbfile_FOUND)
+ set(ktouch_X11_DEPS ${X11_Xkbfile_LIB} ${X11_LIBRARIES})
+endif (X11_Xkbfile_FOUND)
+
+#uncomment this if oxygen icons for ktouch are available
target_link_libraries(ktouch
LINK_PUBLIC
Qt5::Qml
@@ -125,13 +132,9 @@ target_link_libraries(ktouch
KF5::I18n
KF5::KCMUtils
KF5::TextEditor
+ ${ktouch_X11_DEPS}
)
-if (X11_Xkbfile_FOUND)
- target_link_libraries(ktouch ${X11_Xkbfile_LIB} ${X11_LIBRARIES})
-endif (X11_Xkbfile_FOUND)
-
-#uncomment this if oxygen icons for ktouch are available
#kde4_add_app_icon(ktouch_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/ktouch.png")
#kde4_add_app_icon(ktouch_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-app-ktouch.png")