Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Launcher: SVG icon support and icon loading improvements

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@670 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
o9000
2015-01-28 14:47:39 +00:00
committed by mrovi9000@gmail.com
parent ec80e09b0b
commit 1a3ba21245
9 changed files with 1049 additions and 757 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
CMakeLists.txt
View File

@@ -10,7 +10,9 @@ pkg_check_modules( CAIRO REQUIRED cairo )
pkg_check_modules( GLIB2 REQUIRED glib-2.0 )
pkg_check_modules( GOBJECT2 REQUIRED gobject-2.0 )
pkg_check_modules( IMLIB2 REQUIRED imlib2>=1.4.2 )
pkg_check_modules( RSVG librsvg-2.0>=2.36.0 )
pkg_check_modules( SN libstartup-notification-1.0>=0.12 )
find_library( RT_LIBRARY rt )
if( NOT X11_FOUND OR NOT PANGOCAIRO_FOUND OR NOT PANGO_FOUND OR NOT CAIRO_FOUND OR NOT GLIB2_FOUND OR NOT GOBJECT2_FOUND OR NOT IMLIB2_FOUND )
@@ -40,7 +42,8 @@ include_directories( ${PROJECT_BINARY_DIR}
${GLIB2_INCLUDE_DIRS}
${GOBJECT2_INCLUDE_DIRS}
${IMLIB2_INCLUDE_DIRS}
${SN_INCLUDE_DIRS} )
${RSVG_INCLUDE_DIRS}
${SN_INCLUDE_DIRS} )
set( SOURCES src/config.c
src/panel.c
@@ -49,6 +52,8 @@ set( SOURCES src/config.c
src/clock/clock.c
src/systray/systraybar.c
src/launcher/launcher.c
src/launcher/apps-common.c
src/launcher/icon-theme-common.c
src/launcher/xsettings-client.c
src/launcher/xsettings-common.c
src/taskbar/task.c
@@ -63,6 +68,19 @@ set( SOURCES src/config.c
option( ENABLE_BATTERY "Enable battery status plugin" ON )
option( ENABLE_TINT2CONF "Enable tint2conf build, a GTK+2 theme switcher for tint2" ON )
option( ENABLE_EXAMPLES "Install additional tin2rc examples" OFF )
option( ENABLE_RSVG "Rsvg support (launcher only)" ON )
if( ENABLE_BATTERY )
set( SOURCES ${SOURCES} src/battery/battery.c )
add_definitions( -DENABLE_BATTERY )
endif( ENABLE_BATTERY )
if( ENABLE_RSVG )
if( RSVG_FOUND )
add_definitions( -DHAVE_RSVG )
endif( RSVG_FOUND )
endif( ENABLE_RSVG )
option( ENABLE_SN "Startup notification support" ON )
if( ENABLE_SN )
if( SN_FOUND )
@@ -70,11 +88,6 @@ if( ENABLE_SN )
endif( SN_FOUND )
endif( ENABLE_SN)
if( ENABLE_BATTERY )
set( SOURCES ${SOURCES} src/battery/battery.c )
add_definitions( -DENABLE_BATTERY )
endif( ENABLE_BATTERY )
set( MANDIR share/man CACHE PATH "Directory for man pages" )
set( DATADIR share CACHE PATH "Directory for shared data" )
set( SYSCONFDIR /etc CACHE PATH "Directory for configuration files" )
@@ -95,7 +108,8 @@ link_directories( ${X11_LIBRARY_DIRS}
${GLIB2_LIBRARY_DIRS}
${GOBJECT2_LIBRARY_DIRS}
${IMLIB2_LIBRARY_DIRS}
${SN_LIBRARY_DIRS} )
${RSVG_LIBRARY_DIRS}
${SN_LIBRARY_DIRS} )
add_executable(tint2 ${SOURCES})
target_link_libraries( tint2 ${X11_LIBRARIES}
${PANGOCAIRO_LIBRARIES}
@@ -104,7 +118,8 @@ target_link_libraries( tint2 ${X11_LIBRARIES}
${GLIB2_LIBRARIES}
${GOBJECT2_LIBRARIES}
${IMLIB2_LIBRARIES}
${SN_LIBRARIES} )
${RSVG_LIBRARIES}
${SN_LIBRARIES} )
if( RT_LIBRARY )
target_link_libraries( tint2 ${RT_LIBRARY} )
endif( RT_LIBRARY )