diff options
Diffstat (limited to 'deco')
| -rw-r--r-- | deco/CMakeLists.txt | 84 | ||||
| -rw-r--r-- | deco/baghiraclient.cc | 5 | ||||
| -rw-r--r-- | deco/config/CMakeLists.txt | 51 | ||||
| -rw-r--r-- | deco/config/aquariusbutton.cc | 8 | ||||
| -rw-r--r-- | deco/config/colorpicker.cc | 4 | ||||
| -rw-r--r-- | deco/config/configdialog.ui | 17 | ||||
| -rw-r--r-- | deco/config/customdecosettings.ui | 3 |
7 files changed, 148 insertions, 24 deletions
diff --git a/deco/CMakeLists.txt b/deco/CMakeLists.txt new file mode 100644 index 0000000..b04b68e --- /dev/null +++ b/deco/CMakeLists.txt @@ -0,0 +1,84 @@ +tde_import( twin ) + +add_subdirectory( config ) + +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${X11_INCLUDE_DIR} + ${XEXT_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIBRARY_DIRS} + ${X11_LIBRARY_DIRS} + ${XEXT_LIBRARY_DIRS} +) + + +##### pixmaps.h (header) + +set( _pics ${CMAKE_SOURCE_DIR}/imagebase/brushed-gradient + ${CMAKE_SOURCE_DIR}/imagebase/brushed-tile + ${CMAKE_SOURCE_DIR}/imagebase/button_jaguar + ${CMAKE_SOURCE_DIR}/imagebase/button_jaguar_down + ${CMAKE_SOURCE_DIR}/imagebase/button_jaguar_menu + ${CMAKE_SOURCE_DIR}/imagebase/button_jaguar_menu_down + ${CMAKE_SOURCE_DIR}/imagebase/button_milk + ${CMAKE_SOURCE_DIR}/imagebase/button_milk_down + ${CMAKE_SOURCE_DIR}/imagebase/button_milk_menu + ${CMAKE_SOURCE_DIR}/imagebase/button_milk_menu_down + ${CMAKE_SOURCE_DIR}/imagebase/button_panther + ${CMAKE_SOURCE_DIR}/imagebase/button_panther_menu + ${CMAKE_SOURCE_DIR}/imagebase/deco_glossy + ${CMAKE_SOURCE_DIR}/imagebase/icon_above + ${CMAKE_SOURCE_DIR}/imagebase/icon_behind + ${CMAKE_SOURCE_DIR}/imagebase/icon_close + ${CMAKE_SOURCE_DIR}/imagebase/icon_help + ${CMAKE_SOURCE_DIR}/imagebase/icon_maximize + ${CMAKE_SOURCE_DIR}/imagebase/icon_minimize + ${CMAKE_SOURCE_DIR}/imagebase/icon_shade + ${CMAKE_SOURCE_DIR}/imagebase/icon_sticky +) + +set( _header pixmaps.h ) + +add_custom_command( + OUTPUT ${_header} + COMMAND ${UIC_EXECUTABLE} + ARGS -o ${_header} -embed baghira ${_pics} + DEPENDS ${_pics} +) + +##### twin3_baghira (kpart) + +set_source_files_properties( + baghiraclient.cc + PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_header} +) + +tde_add_kpart( twin3_baghira AUTOMOC + + SOURCES + baghiraclient.cc + LINK + tdecore-shared + tdeui-shared + tdecorations-shared + ${X11_LIBRARIES} + ${XEXT_LIBRARIES} + + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### other data + +tde_create_translated_desktop( + SOURCE baghira.desktop + DESTINATION ${DATA_INSTALL_DIR}/twin +) diff --git a/deco/baghiraclient.cc b/deco/baghiraclient.cc index 64d6131..ab14cc4 100644 --- a/deco/baghiraclient.cc +++ b/deco/baghiraclient.cc @@ -7,6 +7,10 @@ // Please see the header file for copyright and license information. ////////////////////////////////////////////////////////////////////////////// +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + // #include <tdeconfig.h> #include <tdeglobal.h> #include <tdeglobalsettings.h> @@ -34,7 +38,6 @@ #include "baghiraclient.h" #include "pixmaps.h" #include "masks.h" -#include "config.h" #define COLOR_SPACE(R,G,B) \ if ( R < 0 ) R = 0; else if ( R > 255 ) R = 255; \ 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> |