yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* move kstyles from runtime into workspace

Browse source 
* make a proper library out of the oxygen helper lib
* make the oxygen widget and kwin style link against it

svn path=/trunk/KDE/kdebase/workspace/; revision=1097791
This commit is contained in:
Aaron J. Seigo 2010-03-02 03:40:34 +00:00
parent bcd8d3f476
commit bfbe44dacc
9 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
clients/oxygen/CMakeLists.txt
View file

@ -1,12 +1,10 @@
########### add version number into compilation defines ########### add version number into compilation defines
add_definitions ( -DAPP_VERSION=\\\"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\\\") add_definitions ( -DAPP_VERSION=\\\"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\\\")
add_subdirectory( config ) add_subdirectory( config )
include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/oxygen)
########### next target ############### ########### next target ###############
set(kwin_oxygen_SRCS set(kwin_oxygen_SRCS
lib/helper.cpp
lib/tileset.cpp
lib/oxygenanimation.cpp
oxygen.cpp oxygen.cpp
oxygenbutton.cpp oxygenbutton.cpp
oxygenclient.cpp oxygenclient.cpp
@ -27,6 +25,7 @@ target_link_libraries(
${X11_X11_LIB} ${X11_X11_LIB}
${X11_Xrender_LIB} ${X11_Xrender_LIB}
kdecorations kdecorations
oxygenstyle
) )
install(TARGETS kwin3_oxygen DESTINATION ${PLUGIN_INSTALL_DIR} ) install(TARGETS kwin3_oxygen DESTINATION ${PLUGIN_INSTALL_DIR} )

2
clients/oxygen/oxygen.h
View file

@ -35,7 +35,7 @@
#include "oxygenexceptionlist.h" #include "oxygenexceptionlist.h"
#include "oxygenshadowcache.h" #include "oxygenshadowcache.h"
#include "lib/helper.h" #include "oxygenhelper.h"
namespace Oxygen namespace Oxygen
{ {

2
clients/oxygen/oxygenbutton.h
View file

@ -31,7 +31,7 @@
#include <kcommondecoration.h> #include <kcommondecoration.h>
#include "oxygen.h" #include "oxygen.h"
#include "lib/oxygenanimation.h" #include "oxygenanimation.h"
namespace Oxygen namespace Oxygen
{ {

2
clients/oxygen/oxygenclient.cpp
View file

@ -31,7 +31,7 @@
#include "oxygen.h" #include "oxygen.h"
#include "oxygenbutton.h" #include "oxygenbutton.h"
#include "oxygensizegrip.h" #include "oxygensizegrip.h"
#include "lib/tileset.h" #include "tileset.h"
#include <cassert> #include <cassert>
#include <cmath> #include <cmath>

4
clients/oxygen/oxygenclient.h
View file

@ -32,8 +32,8 @@
#include "oxygenclientgroupitemdata.h" #include "oxygenclientgroupitemdata.h"
#include "oxygenconfiguration.h" #include "oxygenconfiguration.h"
#include "oxygentitleanimationdata.h" #include "oxygentitleanimationdata.h"
#include "lib/oxygenanimation.h" #include "oxygenanimation.h"
#include "lib/helper.h" #include "oxygenhelper.h"
#include <kcommondecoration.h> #include <kcommondecoration.h>
#include <KGlobalSettings> #include <KGlobalSettings>

2
clients/oxygen/oxygenclientgroupitemdata.h
View file

@ -29,7 +29,7 @@
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
#include "oxygenbutton.h" #include "oxygenbutton.h"
#include "lib/oxygenanimation.h" #include "oxygenanimation.h"
#include <QtCore/QList> #include <QtCore/QList>
#include <QtCore/QWeakPointer> #include <QtCore/QWeakPointer>

2
clients/oxygen/oxygenshadowcache.cpp
View file

@ -27,7 +27,7 @@
#include "oxygenshadowcache.h" #include "oxygenshadowcache.h"
#include "oxygenclient.h" #include "oxygenclient.h"
#include "oxygen.h" #include "oxygen.h"
#include "lib/helper.h" #include "oxygenhelper.h"
#include <cassert> #include <cassert>
#include <KColorUtils> #include <KColorUtils>

2
clients/oxygen/oxygenshadowcache.h
View file

@ -31,7 +31,7 @@
#include <QtGui/QRadialGradient> #include <QtGui/QRadialGradient>
#include "oxygenshadowconfiguration.h" #include "oxygenshadowconfiguration.h"
#include "lib/tileset.h" #include "tileset.h"
class OxygenHelper; class OxygenHelper;

2
clients/oxygen/oxygentitleanimationdata.h
View file

@ -28,7 +28,7 @@
// IN THE SOFTWARE. // IN THE SOFTWARE.
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
#include "lib/oxygenanimation.h" #include "oxygenanimation.h"
#include <cassert> #include <cassert>
#include <QtCore/QObject> #include <QtCore/QObject>