summaryrefslogtreecommitdiffstats
path: root/style
diff options
context:
space:
mode:
authorgregory guy <gregory-tde@laposte.net>2020-07-16 14:07:49 +0200
committerSlávek Banko <slavek.banko@axis.cz>2020-07-26 11:33:19 +0200
commitcd1471858e29d0d23355a93178e063fd0550d31c (patch)
tree6a4d62d831ce3a5a9b7cabac8cf578f622fd5b43 /style
parent443bb972fa23026cdd48cfd5976b210c5dd470eb (diff)
downloadtde-style-baghira-cd1471858e29d0d23355a93178e063fd0550d31c.tar.gz
tde-style-baghira-cd1471858e29d0d23355a93178e063fd0550d31c.zip
Conversion to the cmake building system.
Added a man page taken from the Debian packaging system. Signed-off-by: gregory guy <gregory-tde@laposte.net> Resolve issues that occurred during CMake conversion. Concatenate the commands for generating pixmaps.h with CMake so that there is no need to use the GNU specific sed option -i. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> Signed-off-by: gregory guy <gregory-tde@laposte.net> (cherry picked from commit d0c03cc9a910ea44cea57b1af43bbd90eb86d4bc)
Diffstat (limited to 'style')
-rw-r--r--style/CMakeLists.txt103
-rw-r--r--style/baghira.cpp13
-rw-r--r--style/utils.cpp6
3 files changed, 119 insertions, 3 deletions
diff --git a/style/CMakeLists.txt b/style/CMakeLists.txt
new file mode 100644
index 0000000..6dcc6cf
--- /dev/null
+++ b/style/CMakeLists.txt
@@ -0,0 +1,103 @@
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+ ${X11_INCLUDE_DIR}
+ ${X11_XTEST_INCLUDE_DIRS}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIBRARY_DIRS}
+ ${X11_LIBRARY_DIRS}
+ ${X11_XTEST_LIBRARY_DIRS}
+)
+
+
+##### pixmaps.h (header)
+
+set( _pics ${CMAKE_SOURCE_DIR}/imagebase/brushed-gradient
+ ${CMAKE_SOURCE_DIR}/imagebase/brushed-tile
+ ${CMAKE_SOURCE_DIR}/imagebase/button-base
+ ${CMAKE_SOURCE_DIR}/imagebase/button-milk
+ ${CMAKE_SOURCE_DIR}/imagebase/button-glow
+ ${CMAKE_SOURCE_DIR}/imagebase/button-jaguar
+ ${CMAKE_SOURCE_DIR}/imagebase/button-shadow
+ ${CMAKE_SOURCE_DIR}/imagebase/checkbox
+ ${CMAKE_SOURCE_DIR}/imagebase/checkboxdown
+ ${CMAKE_SOURCE_DIR}/imagebase/checkbox-milk
+ ${CMAKE_SOURCE_DIR}/imagebase/checkboxdown-milk
+ ${CMAKE_SOURCE_DIR}/imagebase/combo
+ ${CMAKE_SOURCE_DIR}/imagebase/combo-milk
+ ${CMAKE_SOURCE_DIR}/imagebase/combo-jaguar
+ ${CMAKE_SOURCE_DIR}/imagebase/combo-shadow
+ ${CMAKE_SOURCE_DIR}/imagebase/progress
+ ${CMAKE_SOURCE_DIR}/imagebase/progress2
+ ${CMAKE_SOURCE_DIR}/imagebase/radio
+ ${CMAKE_SOURCE_DIR}/imagebase/radio_down
+ ${CMAKE_SOURCE_DIR}/imagebase/radio-milk
+ ${CMAKE_SOURCE_DIR}/imagebase/radio_down-milk
+ ${CMAKE_SOURCE_DIR}/imagebase/rectbutton
+ ${CMAKE_SOURCE_DIR}/imagebase/roundFrame
+ ${CMAKE_SOURCE_DIR}/imagebase/sbgroove_btm
+ ${CMAKE_SOURCE_DIR}/imagebase/sbgroove_mid
+ ${CMAKE_SOURCE_DIR}/imagebase/sbgroove_top
+ ${CMAKE_SOURCE_DIR}/imagebase/sbIslider_mid
+ ${CMAKE_SOURCE_DIR}/imagebase/sbslider_btm
+ ${CMAKE_SOURCE_DIR}/imagebase/sbslider_btm_shd
+ ${CMAKE_SOURCE_DIR}/imagebase/sbslider_mid
+ ${CMAKE_SOURCE_DIR}/imagebase/sbslider_top
+ ${CMAKE_SOURCE_DIR}/imagebase/sbslider_top_shd
+ ${CMAKE_SOURCE_DIR}/imagebase/sb_subadd
+ ${CMAKE_SOURCE_DIR}/imagebase/sliderarrow
+ ${CMAKE_SOURCE_DIR}/imagebase/sbgroove_btm-milk
+ ${CMAKE_SOURCE_DIR}/imagebase/sbgroove_mid-milk
+ ${CMAKE_SOURCE_DIR}/imagebase/sbgroove_top-milk
+ ${CMAKE_SOURCE_DIR}/imagebase/sbslider_btm-milk
+ ${CMAKE_SOURCE_DIR}/imagebase/sbslider_mid-milk
+ ${CMAKE_SOURCE_DIR}/imagebase/sbslider_top-milk
+ ${CMAKE_SOURCE_DIR}/imagebase/sb_subadd-milk
+ ${CMAKE_SOURCE_DIR}/imagebase/sliderarrow-milk
+ ${CMAKE_SOURCE_DIR}/imagebase/tab
+ ${CMAKE_SOURCE_DIR}/imagebase/tab-milk
+ ${CMAKE_SOURCE_DIR}/imagebase/tab-jaguar
+)
+
+set( _header pixmaps.h )
+
+add_custom_command(
+ OUTPUT ${_header}
+ COMMAND ${UIC_EXECUTABLE}
+ ARGS -o ${_header} -embed baghira ${_pics}
+ DEPENDS ${_pics}
+)
+
+
+##### baghira (kpart)
+
+set_source_files_properties(
+ baghira.cpp
+ PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_header}
+)
+
+tde_add_kpart( baghira AUTOMOC
+
+ SOURCES
+ baghira.cpp
+ optionHandler.cpp
+ polish.cpp utils.cpp
+ LINK
+ tdecore-shared
+ tdeui-shared
+ ${X11_XTEST_LIBRARIES}
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles
+)
+
+
+install(
+ FILES baghira.themerc
+ DESTINATION ${DATA_INSTALL_DIR}/tdestyle/themes
+)
diff --git a/style/baghira.cpp b/style/baghira.cpp
index 8434cf1..608d9af 100644
--- a/style/baghira.cpp
+++ b/style/baghira.cpp
@@ -1,3 +1,14 @@
+/*
+ * This source code refers to the MacStyle style. It is marked as obsolete
+ * in tqnamespace.h and is not defined when TQT_NO_COMPAT is set.
+ * Therefore, QT_NO_COMPAT is forced to be canceled here.
+*/
+#undef QT_NO_COMPAT
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "baghira.h"
#include "bitmaps.h"
#include "pixmaps.h"
@@ -44,7 +55,7 @@
#include <tdetoolbar.h>
#include <tdetoolbarbutton.h>
#include <kwordwrap.h>
-#include "config.h"
+
#define PRINTDEVICE(p) tqWarning("device is %s", (p->device()->devType() == TQInternal::Widget) ?\
"Widget": (p->device()->devType() == TQInternal::Pixmap) ?\
diff --git a/style/utils.cpp b/style/utils.cpp
index e39b5b0..aaa8a6e 100644
--- a/style/utils.cpp
+++ b/style/utils.cpp
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "baghira.h"
#include <tqbitmap.h>
@@ -12,8 +16,6 @@
//#include <kwordwrap.h>
-#include "config.h"
-
#ifndef CLAMP
#define CLAMP(x,l,u) x < l ? l :\
x > u ? u :\