Browse Source

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>
pull/2/head
Gregory Guy 2 months ago
parent
commit
d0c03cc9a9
Signed by: cethyel GPG Key ID: 3BCCA0F7AB4536F4
45 changed files with 831 additions and 87 deletions
  1. +87
    -0
      CMakeLists.txt
  2. +56
    -0
      ConfigureChecks.cmake
  3. +35
    -0
      bab/CMakeLists.txt
  4. +1
    -1
      bab/bab.h
  5. +11
    -0
      colorscheme/CMakeLists.txt
  6. +8
    -0
      config.h.cmake
  7. +61
    -0
      config/CMakeLists.txt
  8. +4
    -2
      config/colordialog.cpp
  9. +2
    -0
      config/colorpicker.cpp
  10. +0
    -19
      config/configdialog.ui
  11. +0
    -3
      config/help.ui
  12. +5
    -3
      config/tdestyle_baghira_config.cpp
  13. +84
    -0
      deco/CMakeLists.txt
  14. +4
    -1
      deco/baghiraclient.cc
  15. +51
    -0
      deco/config/CMakeLists.txt
  16. +6
    -2
      deco/config/aquariusbutton.cc
  17. +3
    -1
      deco/config/colorpicker.cc
  18. +0
    -17
      deco/config/configdialog.ui
  19. +0
    -3
      deco/config/customdecosettings.ui
  20. +14
    -0
      doc/CMakeLists.txt
  21. +5
    -0
      doc/man/CMakeLists.txt
  22. +36
    -0
      doc/man/bab.1
  23. +3
    -0
      icons/CMakeLists.txt
  24. +38
    -0
      kickermenu-3.3/CMakeLists.txt
  25. +28
    -0
      kickermenu/CMakeLists.txt
  26. +36
    -0
      sessionapplet/CMakeLists.txt
  27. +2
    -0
      sessionapplet/usermanager.cpp
  28. +1
    -1
      sessionapplet/usermanager.h
  29. +54
    -0
      sidebar/CMakeLists.txt
  30. +1
    -1
      sidebar/baghirasidebar.h
  31. +1
    -1
      sidebar/dndlistbox.h
  32. +0
    -1
      sidebar/linkconfig.ui
  33. +1
    -1
      sidebar/linkview.h
  34. +1
    -1
      sidebar/listboxlink.h
  35. +58
    -0
      starter/CMakeLists.txt
  36. +1
    -1
      starter/Makefile.am
  37. +0
    -9
      starter/configdialog.ui
  38. +3
    -1
      starter/menu.cpp
  39. +1
    -1
      starter/menu.h
  40. +9
    -7
      starter/starter.cpp
  41. +1
    -1
      starter/starter.h
  42. +0
    -6
      starter/starterconfig.ui
  43. +103
    -0
      style/CMakeLists.txt
  44. +12
    -1
      style/baghira.cpp
  45. +4
    -2
      style/utils.cpp

+ 87
- 0
CMakeLists.txt View File

@@ -0,0 +1,87 @@
############################################
# #
# Improvements and feedbacks are welcome #
# #
# This file is released under GPL >= 3 #
# #
############################################


cmake_minimum_required( VERSION 2.8 )


#### general package setup

project( tde-style-baghira )
set( VERSION R14.1.0 )


#### include essential cmake modules

include( FindPkgConfig )
include( CheckFunctionExists )
include( CheckSymbolExists )
include( CheckIncludeFile )
include( CheckLibraryExists )
include( CheckCSourceCompiles )
include( CheckCXXSourceCompiles )


#### include our cmake modules

set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" )
include( TDEMacros )


##### setup install paths

include( TDESetupPaths )
tde_setup_paths( )


##### optional stuff

option( WITH_ALL_OPTIONS "Enable all optional support" OFF )
option( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} )


##### user requested modules

option( BUILD_ALL "Build all" ON )
option( BUILD_DOC "Build documentation" ${BUILD_ALL} )
option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} )


##### configure checks

include( ConfigureChecks.cmake )


###### global compiler settings

add_definitions( -DHAVE_CONFIG_H )

set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )


##### directories

add_subdirectory( bab )
add_subdirectory( deco )
add_subdirectory( icons )
add_subdirectory( style )
add_subdirectory( config )
add_subdirectory( starter )
add_subdirectory( kickermenu )
add_subdirectory( colorscheme )
add_subdirectory( sessionapplet )
tde_conditional_add_subdirectory( BUILD_DOC doc )
#tde_conditional_add_subdirectory( BUILD_TRANSLATIONS translations )


##### write configure files

configure_file( config.h.cmake config.h @ONLY )

+ 56
- 0
ConfigureChecks.cmake View File

@@ -0,0 +1,56 @@
###########################################
# #
# Improvements and feedback are welcome #
# #
# This file is released under GPL >= 3 #
# #
###########################################

# required stuff
find_package( TQt )
find_package( TDE )

tde_setup_architecture_flags( )

include(TestBigEndian)
test_big_endian(WORDS_BIGENDIAN)

tde_setup_largefiles( )


##### check for gcc visibility support

if( WITH_GCC_VISIBILITY )
tde_setup_gcc_visibility( )
endif( WITH_GCC_VISIBILITY )

##### check for X11

find_package( X11 )


##### check for Xext

pkg_search_module( XEXT xext )

if( NOT XEXT_FOUND )
tde_message_fatal( "Xext is required, but was not found on your system." )
endif()


##### check for sed

find_program( SED_EXECUTABLE sed )

if( NOT SED_EXECUTABLE )
tde_message_fatal( "Sed unix tool is required, but was not found on your system." )
endif()


##### check for XTest

pkg_search_module( X11_XTEST xtst )

if( NOT X11_XTest_FOUND )
tde_message_fatal( "XTest is required, but xtest was not found on your system." )
endif()

+ 35
- 0
bab/CMakeLists.txt View File

@@ -0,0 +1,35 @@

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}
)


##### bab (executable)

tde_add_executable( bab AUTOMOC

SOURCES
main.cpp
styleconfdialog.cpp
bab_iface.skel
LINK
tdecore-shared
tdeui-shared
${X11_LIBRARIES}
${XEXT_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR}
)

+ 1
- 1
bab/bab.h View File

@@ -22,7 +22,7 @@
#define _BAB_H_

#ifdef HAVE_CONFIG_H
#include <config.h>
#include "config.h"
#endif
//#include <dcopclient.h>
#include "bab_iface.h"


+ 11
- 0
colorscheme/CMakeLists.txt View File

@@ -0,0 +1,11 @@
##### other data

install(
FILES AquaBlue.kcsrc
DESTINATION ${DATA_INSTALL_DIR}/tdedisplay/color-schemes
)

install(
FILES AquaGraphite.kcsrc
DESTINATION ${DATA_INSTALL_DIR}/tdedisplay/color-schemes
)

+ 8
- 0
config.h.cmake View File

@@ -0,0 +1,8 @@
#define VERSION "@VERSION@"

// Defined if you have fvisibility and fvisibility-inlines-hidden support.
#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1

/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#cmakedefine WORDS_BIGENDIAN @WORDS_BIGENDIAN@

+ 61
- 0
config/CMakeLists.txt View File

@@ -0,0 +1,61 @@

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_LIBRARY_DIRS}
${X11_LIBRARY_DIRS}
)


##### pixmaps.h (header)

set( _pics ${CMAKE_SOURCE_DIR}/imagebase/button-base
${CMAKE_SOURCE_DIR}/imagebase/button-shadow
${CMAKE_SOURCE_DIR}/imagebase/brush-me
)

set( _header pixmaps.h )

add_custom_command(
OUTPUT ${_header}
COMMAND
${UIC_EXECUTABLE} -embed baghira ${_pics} |
${SED_EXECUTABLE}
-e 's|void qInitImages_baghira|static void qInitImages_baghira|'
-e 's|void qCleanupImages_baghira|static void qCleanupImages_baghira|'
> ${_header}
DEPENDS ${_pics}
)


##### tdestyle_baghira_config (kpart)

set_source_files_properties(
tdestyle_baghira_config.cpp colordialog.cpp
PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${_header}
)


tde_add_kpart( tdestyle_baghira_config AUTOMOC

SOURCES
configdialog.ui
help.ui about.ui
tdestyle_baghira_config.cpp
colordialog.cpp
colorpicker.cpp
LINK
tdecore-shared
tdeui-shared
tdeio-shared

DESTINATION ${PLUGIN_INSTALL_DIR}
)

+ 4
- 2
config/colordialog.cpp View File

@@ -13,9 +13,9 @@
#include <kiconloader.h>
#include "colorpicker.h"
#include "pixmaps.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#ifndef CLAMP
#define CLAMP(x,l,u) x < l ? l :\
x > u ? u :\
@@ -298,3 +298,5 @@ TQImage & DemoWindow::tintButton(TQImage &src, TQColor & c)
}
return ( dest );
}

#include "colordialog.moc"

+ 2
- 0
config/colorpicker.cpp View File

@@ -79,3 +79,5 @@ void ColorPicker::init()
{
color_ = color();
}

#include "colorpicker.moc"

+ 0
- 19
config/configdialog.ui View File

@@ -3016,24 +3016,5 @@
<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>
<includehint>kcolorbutton.h</includehint>
<includehint>kcolorbutton.h</includehint>
</includehints>
</UI>

+ 0
- 3
config/help.ui View File

@@ -298,8 +298,5 @@ for hosting the Project</string>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kactivelabel.h</includehint>
<includehint>kactivelabel.h</includehint>
<includehint>kactivelabel.h</includehint>
<includehint>kactivelabel.h</includehint>
</includehints>
</UI>

+ 5
- 3
config/tdestyle_baghira_config.cpp View File

@@ -18,6 +18,10 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/

#ifdef HAVE_CONFIG_H
#include "config.h"
#endif

#include <tqdesktopwidget.h>
#include <tqlayout.h>
#include <tqpushbutton.h>
@@ -63,8 +67,6 @@
#include "colordialog.h"
#include "colorpicker.h"

#include "config.h"

//#define VERSION "0.7"

#ifndef TDE_VERSION_STRING
@@ -969,7 +971,7 @@ void tdestyle_baghira_config::menuToggled(bool active)

extern "C"
{
TQWidget* allocate_tdestyle_config(TQWidget* parent){
KDE_EXPORT TQWidget* allocate_tdestyle_config(TQWidget* parent){
return(new tdestyle_baghira_config(parent, "BaghiraConfig"));
}
}


+ 84
- 0
deco/CMakeLists.txt View File

@@ -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
)

+ 4
- 1
deco/baghiraclient.cc View File

@@ -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; \


+ 51
- 0
deco/config/CMakeLists.txt View File

@@ -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}
)

+ 6
- 2
deco/config/aquariusbutton.cc View File

@@ -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"

+ 3
- 1
deco/config/colorpicker.cc View File

@@ -121,4 +121,6 @@ void ColorPicker::reset(){

void ColorPicker::init(){
color_ = Color();
}
}

#include "colorpicker.moc"

+ 0
- 17
deco/config/configdialog.ui View File

@@ -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>

+ 0
- 3
deco/config/customdecosettings.ui View File

@@ -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>

+ 14
- 0
doc/CMakeLists.txt View File

@@ -0,0 +1,14 @@
file( GLOB _dirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} * )
string( REGEX REPLACE "[ \r\n\t]+" ";" _linguas "$ENV{LINGUAS}" )

foreach( _dir ${_dirs} )
if( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${_dir} AND
EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_dir}/CMakeLists.txt )
if( "${_dir}" STREQUAL "en" OR
"${_dir}" STREQUAL "man" OR
"${_linguas}" MATCHES "^;*$" OR
";${_linguas};" MATCHES ";${_dir};" )
add_subdirectory( ${_dir} )
endif( )
endif()
endforeach()

+ 5
- 0
doc/man/CMakeLists.txt View File

@@ -0,0 +1,5 @@
INSTALL(
FILES bab.1
DESTINATION ${MAN_INSTALL_DIR}/man1
COMPONENT doc
)

+ 36
- 0
doc/man/bab.1 View File

@@ -0,0 +1,36 @@
.\" Author: Jose Luis Tallon <jltallon@adv-solutions.net>
.\"
.\" This is free software; you may redistribute it and/or modify
.\" it under the terms of the GNU General Public License as
.\" published by the Free Software Foundation; either version 2,
.\" or (at your option) any later version.
.\"
.\" This is distributed in the hope that it will be useful, but
.\" WITHOUT ANY WARRANTY; without even the implied warranty of
.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
.\" GNU General Public License for more details.
.\"
.\" You should have received a copy of the GNU General Public License
.\" along with the Debian GNU/Linux system; if not, write to the Free
.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
.\" 02111-1307 USA
.TH bab "1" "October 2004"
.SH NAME
bab \- Baghira's config tray applet
.SH SYNOPSIS
bab
.SH DESCRIPTION
.B bab
is a simple systray application, which enables you to dinamically
change some aspects of Baghira's configuration without accesing
Trinity Control Center
.PP
Complete documentation can be found in docbook format in
/opt/trinity/share/doc/kde/HTML/<lang>/baghira/ on this system.
.SH AUTHOR
Thomas L\[:u]bking <baghira-style@users.sourceforge.net>
.PP
This manual page was written by Jose Luis Tallon
.nh
<jltallon@adv\-solutions.net>
for the \fBDebian\fP system (but may be used by others).

+ 3
- 0
icons/CMakeLists.txt View File

@@ -0,0 +1,3 @@
##### icons

tde_install_icons()

+ 38
- 0
kickermenu-3.3/CMakeLists.txt View File

@@ -0,0 +1,38 @@

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_LIBRARY_DIRS}
${X11_LIBRARY_DIRS}
)


##### b_menu_panelapplet (kpart)

tde_add_kpart( b_menu_panelapplet AUTOMOC

SOURCES
menuapplet.cpp
menuapplet.skel
LINK
tdecore-shared
tdeui-shared

DESTINATION ${PLUGIN_INSTALL_DIR}
)


##### other data

tde_create_translated_desktop(
SOURCE b_menuapplet.desktop
DESTINATION ${DATA_INSTALL_DIR}/kicker/applets
)

+ 28
- 0
kickermenu/CMakeLists.txt View File

@@ -0,0 +1,28 @@

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}
)


##### b_menu_panelapplet (kpart)

tde_add_kpart( b_menu_panelapplet AUTOMOC

SOURCES
menuapplet.cpp
menuapplet.skel
LINK
tdecore-shared
tdeui-shared

DESTINATION ${PLUGIN_INSTALL_DIR}
)

+ 36
- 0
sessionapplet/CMakeLists.txt View File

@@ -0,0 +1,36 @@

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}
)


##### usermanager_panelapplet (shared)

tde_add_library( usermanager_panelapplet MODULE AUTOMOC

SOURCES
usermanager.cpp
dmctl.cpp
LINK
tdeui-shared
tdecore-shared

DESTINATION ${LIB_INSTALL_DIR}
)


##### other data

tde_create_translated_desktop(
SOURCE usermanager.desktop
DESTINATION ${DATA_INSTALL_DIR}/kicker/applets
)

+ 2
- 0
sessionapplet/usermanager.cpp View File

@@ -279,3 +279,5 @@ extern "C"
return new UserManager(configFile, KPanelApplet::Normal, KPanelApplet::About, parent, "usermanager");
}
}

#include "usermanager.moc"

+ 1
- 1
sessionapplet/usermanager.h View File

@@ -23,7 +23,7 @@
#define USERMANAGER_H

#ifdef HAVE_CONFIG_H
#include <config.h>
#include "config.h"
#endif

#include <kpanelapplet.h>


+ 54
- 0
sidebar/CMakeLists.txt View File

@@ -0,0 +1,54 @@

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}
)


##### konqsidebar_baghirasidebar (kpart)

tde_add_kpart( konqsidebar_baghirasidebar AUTOMOC

SOURCES
linkconfig.ui
baghirasidebariface.skel
../starter/baghiralinkdrag.cpp
baghirasidebar.cpp
linkview.cpp
listboxlink.cpp
dndlistbox.cpp
LINK
tdecore-shared
tdeui-shared
tdeio-shared
tdeparts-shared
konqsidebarplugin-shared

DESTINATION ${PLUGIN_INSTALL_DIR}
)


##### other data

tde_create_translated_desktop(
SOURCE baghirasidebar_add.desktop
DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/add
)

tde_create_translated_desktop(
SOURCE baghirasidebar.desktop
DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/entries
)

install(
FILES ../imagebase/poof.png
DESTINATION ${DATA_INSTALL_DIR}/baghira
)

+ 1
- 1
sidebar/baghirasidebar.h View File

@@ -3,7 +3,7 @@
#define BAGHIRASIDEBAR_H

#ifdef HAVE_CONFIG_H
#include <config.h>
#include "config.h"
#endif

#include <konqsidebarplugin.h>


+ 1
- 1
sidebar/dndlistbox.h View File

@@ -3,7 +3,7 @@
#define DNDLISTBOX_H

#ifdef HAVE_CONFIG_H
#include <config.h>
#include "config.h"
#endif

#include <tdelistbox.h>


+ 0
- 1
sidebar/linkconfig.ui View File

@@ -180,7 +180,6 @@
<includehints>
<includehint>klineedit.h</includehint>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kicondialog.h</includehint>
</includehints>


+ 1
- 1
sidebar/linkview.h View File

@@ -3,7 +3,7 @@
#define LINKVIEW_H

#ifdef HAVE_CONFIG_H
#include <config.h>
#include "config.h"
#endif

#include <tqscrollview.h>


+ 1
- 1
sidebar/listboxlink.h View File

@@ -3,7 +3,7 @@
#define LISTBOXLINK_H

#ifdef HAVE_CONFIG_H
#include <config.h>
#include "config.h"
#endif

#include <tqlistbox.h>


+ 58
- 0
starter/CMakeLists.txt View File

@@ -0,0 +1,58 @@

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}
)


##### baghirastarter (shared)

tde_add_library( baghirastarter SHARED AUTOMOC

SOURCES
starterconfig.ui
starterhelp.ui
configdialog.ui
help.ui
linkconfig.ui
starteriface.skel
baghiralinkdrag.cpp
menu.cpp starter.cpp
LINK
tdeui-shared
tdecore-shared
tdeio-shared
${X11_XTEST_LIBRARIES}

DESTINATION ${LIB_INSTALL_DIR}
)


##### icons

tde_install_icons()


##### other data

install(
FILES ../imagebase/poof.png
DESTINATION ${DATA_INSTALL_DIR}/baghira
)

tde_create_translated_desktop(
SOURCE starter.desktop
DESTINATION ${DATA_INSTALL_DIR}/kicker/applets
)

+ 1
- 1
starter/Makefile.am View File

@@ -4,7 +4,7 @@ KDE_ICON = AUTO

lib_LTLIBRARIES = libbaghirastarter.la

libbaghirastarter_la_SOURCES = baghiralinkdrag.cpp menu.cpp starter.cpp starterconfig.ui starterhelp.ui config.ui help.ui linkconfig.ui starteriface.skel
libbaghirastarter_la_SOURCES = baghiralinkdrag.cpp menu.cpp starter.cpp starterconfig.ui starterhelp.ui configdialog.ui help.ui linkconfig.ui starteriface.skel
libbaghirastarter_la_LDFLAGS = -module -avoid-version $(all_libraries)
libbaghirastarter_la_LIBADD = -lXtst $(LIB_TDEUI) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO) -ltdefx -lDCOP



starter/config.ui → starter/configdialog.ui View File

@@ -557,19 +557,10 @@
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kicondialog.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>ktextedit.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kkeybutton.h</includehint>
</includehints>
</UI>

+ 3
- 1
starter/menu.cpp View File

@@ -46,7 +46,7 @@
//#include "kdrawer.h"
#include "baghiralinkdrag.h"
#include "menu.h"
#include "config.h"
#include "configdialog.h"
#include "help.h"
#include "linkconfig.h"
#define OPAQUE 0xffffffff
@@ -2247,3 +2247,5 @@ bool StartMenu::eventFilter ( TQObject * o, TQEvent * e )
}
return false;
}

#include "menu.moc"

+ 1
- 1
starter/menu.h View File

@@ -3,7 +3,7 @@
#define STARTMENU_H

#ifdef HAVE_CONFIG_H
#include <config.h>
#include "config.h"
#endif

#include <tqpoint.h>


+ 9
- 7
starter/starter.cpp View File

@@ -7,7 +7,7 @@
#include <tdeconfig.h>
#include <tdemessagebox.h>
#include <tdeapplication.h>
# include <tdepopupmenu.h>
#include <tdepopupmenu.h>
#include <tqimage.h>
#include <tqfile.h>
#include <tqlabel.h>
@@ -228,9 +228,9 @@ void starter::reloadImages()
pth = configDialog->BaseURL->url();
else
pth = iLoader->iconPath("bStarter", TDEIcon::Small, true);
if (pth)
if (!pth.isEmpty())
pixmap = TQImage(pth);
if (!pth || pixmap.isNull())
if (pth.isEmpty() || pixmap.isNull())
{
pixmap = TQPixmap(22,22);
pixmap.fill(TQt::black);
@@ -240,9 +240,9 @@ void starter::reloadImages()
pth = configDialog->HoverURL->url();
else
pth = iLoader->iconPath("bStarter_hover", TDEIcon::Small, true);
if (pth)
if (!pth.isEmpty())
hoverPixmap = TQImage(pth);
if (!pth || hoverPixmap.isNull())
if (pth.isEmpty() || hoverPixmap.isNull())
{
hoverPixmap = TQPixmap(22,22);
hoverPixmap.fill(TQt::black);
@@ -252,9 +252,9 @@ void starter::reloadImages()
pth = configDialog->DownURL->url();
else
pth = iLoader->iconPath("bStarter_down", TDEIcon::Small, true);
if (pth)
if (!pth.isEmpty())
downPixmap = TQImage(pth);
if (!pth || downPixmap.isNull())
if (pth.isEmpty() || downPixmap.isNull())
{
downPixmap = TQPixmap(22,22);
downPixmap.fill(TQt::white);
@@ -481,3 +481,5 @@ extern "C"
parent, "baghirastarter");
}
}

#include "starter.moc"

+ 1
- 1
starter/starter.h View File

@@ -3,7 +3,7 @@
#define STARTER_H

#ifdef HAVE_CONFIG_H
#include <config.h>
#include "config.h"
#endif

#include <kpanelapplet.h>


+ 0
- 6
starter/starterconfig.ui View File

@@ -858,12 +858,6 @@
</connections>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>
<includehint>kurlrequester.h</includehint>
<includehint>klineedit.h</includehint>
<includehint>kpushbutton.h</includehint>


+ 103
- 0
style/CMakeLists.txt View File

@@ -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
)

+ 12
- 1
style/baghira.cpp View File

@@ -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, TQT_NO_COMPAT is forced to be canceled here.
*/
#undef TQT_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) ?\


+ 4
- 2
style/utils.cpp View File

@@ -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 :\


Loading…
Cancel
Save