summaryrefslogtreecommitdiffstats
path: root/deco/config
diff options
context:
space:
mode:
authorgregory guy <[email protected]>2020-07-16 14:07:49 +0200
committerSlávek Banko <[email protected]>2020-07-26 11:33:19 +0200
commitcd1471858e29d0d23355a93178e063fd0550d31c (patch)
tree6a4d62d831ce3a5a9b7cabac8cf578f622fd5b43 /deco/config
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 <[email protected]> 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 <[email protected]> Signed-off-by: gregory guy <[email protected]> (cherry picked from commit d0c03cc9a910ea44cea57b1af43bbd90eb86d4bc)
Diffstat (limited to 'deco/config')
-rw-r--r--deco/config/CMakeLists.txt51
-rw-r--r--deco/config/aquariusbutton.cc8
-rw-r--r--deco/config/colorpicker.cc4
-rw-r--r--deco/config/configdialog.ui17
-rw-r--r--deco/config/customdecosettings.ui3
5 files changed, 60 insertions, 23 deletions
diff --git a/deco/config/CMakeLists.txt b/deco/config/CMakeLists.txt
new file mode 100644
index 0000000..5a4a344
--- /dev/null
+++ b/deco/config/CMakeLists.txt
@@ -0,0 +1,51 @@
+
+include_directories(
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TDE_INCLUDE_DIR}
+ ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+ ${TQT_LIBRARY_DIRS}
+ ${TDE_LIBRARY_DIRS}
+)
+
+
+##### pixmaps.h (header)
+
+set( _pics ${CMAKE_SOURCE_DIR}/imagebase/icon_help
+ ${CMAKE_SOURCE_DIR}/imagebase/preview
+ ${CMAKE_SOURCE_DIR}/imagebase/preview-menu
+)
+
+set( _header pixmaps.h )
+
+add_custom_command(
+ OUTPUT ${_header}
+ COMMAND ${UIC_EXECUTABLE}
+ ARGS -o ${_header} -embed baghira ${_pics}
+ DEPENDS ${_pics}
+)
+
+##### twin_baghira_config (kpart)
+
+set_source_files_properties(
+ baghiraconfig.cc
+ PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_header}
+)
+
+tde_add_kpart( twin_baghira_config AUTOMOC
+
+ SOURCES
+ configdialog.ui
+ baghiraconfig.cc
+ aquariusbutton.cc
+ colorpicker.cc
+ LINK
+ tdecore-shared
+ tdeui-shared
+
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
diff --git a/deco/config/aquariusbutton.cc b/deco/config/aquariusbutton.cc
index 6a8011f..9cf1b0e 100644
--- a/deco/config/aquariusbutton.cc
+++ b/deco/config/aquariusbutton.cc
@@ -1,10 +1,12 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "aquariusbutton.h"
#include <tqcolor.h>
#include <tqpixmap.h>
#include <tqpainter.h>
#include <kimageeffect.h>
-#include "config.h"
-
#define COLOR_SPACE(R,G,B) \
if ( R < 0 ) R = 0; else if ( R > 255 ) R = 255; \
@@ -160,3 +162,5 @@ void AquariusButton::paintEvent( TQPaintEvent *e){
// void AquariusButton::clicked(){
// }
+
+#include "aquariusbutton.moc"
diff --git a/deco/config/colorpicker.cc b/deco/config/colorpicker.cc
index 6934920..c5301c1 100644
--- a/deco/config/colorpicker.cc
+++ b/deco/config/colorpicker.cc
@@ -121,4 +121,6 @@ void ColorPicker::reset(){
void ColorPicker::init(){
color_ = Color();
-} \ No newline at end of file
+}
+
+#include "colorpicker.moc"
diff --git a/deco/config/configdialog.ui b/deco/config/configdialog.ui
index f4e148a..18723c2 100644
--- a/deco/config/configdialog.ui
+++ b/deco/config/configdialog.ui
@@ -3067,22 +3067,5 @@ from multipart titles</string>
<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>
- <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>
</UI>
diff --git a/deco/config/customdecosettings.ui b/deco/config/customdecosettings.ui
index 2a98265..95460d0 100644
--- a/deco/config/customdecosettings.ui
+++ b/deco/config/customdecosettings.ui
@@ -579,8 +579,5 @@
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
- <includehint>kcolorbutton.h</includehint>
</includehints>
</UI>