From 64509425b39b988f3d9436b5c4482db8c86cf310 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 27 Mar 2020 00:28:44 +0900 Subject: [PATCH] 1) Added option for gcc visibility 2) Added man page from Debian packaging repo 3) Added application icon 4) Installed xpm icons Signed-off-by: Michele Calgaro --- CMakeLists.txt | 11 +-- ConfigureChecks.cmake | 2 + icons/CMakeLists.txt | 4 +- icons/anchor.xpm | 45 ------------ ...{tdedocker.png => hi128-app-tdedocker.png} | Bin {src => icons}/question.xpm | 0 {src => icons}/tdedocker.xpm | 0 man/CMakeLists.txt | 5 ++ man/tdedocker.1 | 68 ++++++++++++++++++ src/CMakeLists.txt | 1 - 10 files changed, 85 insertions(+), 51 deletions(-) delete mode 100644 icons/anchor.xpm rename icons/{tdedocker.png => hi128-app-tdedocker.png} (100%) rename {src => icons}/question.xpm (100%) rename {src => icons}/tdedocker.xpm (100%) create mode 100644 man/CMakeLists.txt create mode 100644 man/tdedocker.1 diff --git a/CMakeLists.txt b/CMakeLists.txt index 2af26a0..2a876f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,6 +15,7 @@ cmake_minimum_required( VERSION 2.8 ) ##### general package setup ##################### project( tdedocker ) +set( VERSION R14.1.0 ) ##### include essential cmake modules ########### @@ -43,12 +44,15 @@ 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} ) option( WITH_TRACING "Enable code tracing" OFF ) ##### user requested modules #################### -option( BUILD_ALL "Build all" OFF ) +option( BUILD_ALL "Build all" ON ) +option( BUILD_DOC "Build documentation" ${BUILD_ALL} ) option( BUILD_TRANSLATIONS "Build translations" ${BUILD_ALL} ) @@ -66,13 +70,12 @@ set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" ##### source directories ######################## -add_subdirectory( src ) add_subdirectory( icons ) +add_subdirectory( src ) +tde_conditional_add_subdirectory( BUILD_DOC man ) tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po ) ##### other data ################################ INSTALL(FILES tdedocker.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) - - diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 8d86a1c..d127d33 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -27,11 +27,13 @@ if( WITH_GCC_VISIBILITY ) tde_setup_gcc_visibility( ) endif( WITH_GCC_VISIBILITY ) + ##### enable code tracing if( WITH_TRACING ) add_definitions( -DENABLE_TRACING ) endif ( ) + # check required packages pkg_search_module( XMU xmu ) if( NOT XMU_FOUND ) diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt index da36b29..67e594e 100644 --- a/icons/CMakeLists.txt +++ b/icons/CMakeLists.txt @@ -9,5 +9,7 @@ # ################################################# -install ( FILES tdedocker.png question.png +tde_install_icons( ) + +install ( FILES question.png question.xpm tdedocker.xpm DESTINATION ${DATA_INSTALL_DIR}/tdedocker/icons ) diff --git a/icons/anchor.xpm b/icons/anchor.xpm deleted file mode 100644 index c6f16d3..0000000 --- a/icons/anchor.xpm +++ /dev/null @@ -1,45 +0,0 @@ -/* XPM */ -static char *tdedocker_xpm[]={ -"27 24 18 1", -". c None", -"b c #6e6e6e", -"g c #727272", -"h c #777777", -"i c #7a7a7a", -"e c #7b7b7b", -"f c #7c7c7c", -"# c #7d7d7d", -"d c #7e7e7e", -"c c #7f7f7f", -"j c #808080", -"n c #818181", -"a c #828282", -"l c #838383", -"m c #848484", -"k c #858585", -"o c #868686", -"p c #898989", -"...........................", -"...###.....a...............", -"..##b##...aaa..............", -"..##.c#..ada...............", -"..##e###afc................", -"...gh#f###a...........dda..", -"......ei###..........dddda.", -".....aafc###.........dddda.", -"....aaja.e###.........daa..", -"....aaa...####........daa..", -"...aaa.....###a.......daa..", -"....a.......d##k......cca..", -".............##al.....dca..", -"..............#aac....fca..", -"...............jaaj..#fma..", -"................naanaa#aa..", -".................kaaaana...", -"..................aaaao....", -".................aajamp....", -"..........a....aaaaaaco....", -".........aaaaaaaaaaa.......", -"........aaammlalaa.........", -".........aaaaaa............", -"..........a................"}; diff --git a/icons/tdedocker.png b/icons/hi128-app-tdedocker.png similarity index 100% rename from icons/tdedocker.png rename to icons/hi128-app-tdedocker.png diff --git a/src/question.xpm b/icons/question.xpm similarity index 100% rename from src/question.xpm rename to icons/question.xpm diff --git a/src/tdedocker.xpm b/icons/tdedocker.xpm similarity index 100% rename from src/tdedocker.xpm rename to icons/tdedocker.xpm diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt new file mode 100644 index 0000000..8512250 --- /dev/null +++ b/man/CMakeLists.txt @@ -0,0 +1,5 @@ +INSTALL( + FILES ${PROJECT_NAME}.1 + DESTINATION ${MAN_INSTALL_DIR}/man1 + COMPONENT doc +) diff --git a/man/tdedocker.1 b/man/tdedocker.1 new file mode 100644 index 0000000..e5f3830 --- /dev/null +++ b/man/tdedocker.1 @@ -0,0 +1,68 @@ +.TH TDEDOCKER 1 +.SH NAME +tdedocker \- puts everything to traybar +.SH SYNOPSIS +.B tdedocker +.RI [ options ] +.br +.SH DESCRIPTION +This manual page documents briefly the +.B tdedocker +command. +.PP +\fBtdedocker\fP is a program that puts every application to the system tray. +.SH OPTIONS +These programs follow the usual GNU command line syntax, with long +options starting with two dashes (`-'). +A summary of options is included below. +.TP +.B \-a +Show author information. Yup, about me. +.TP +.B \-b +Suppress the warning dialog when docking non-normal windows (blind mode) +.TP +.B \-d +Disable session management. TDEDocker will not attempt to redock this application when you relogin. +.TP +.B \-e +Enable session management. TDEDocker will attempt to redock this application when you relogin. .B[default] +.TP +.B \-f +Dock window that has the focus(active window). +.TP +.B \-i "icon" +Custom dock icon. +.TP +.B \-h +Show summary of options. +.TP +.B \-l +Launch on startup +.TP +.B \-m +Keep application window mapped (dont hide on dock) +.TP +.B \-o +Dock when obscured +.TP +.B \-p "secs" +By default, when the title of the application changes, it is ballooned from the system tray for 4 seconds. Works excellently with xmms +.TP +.B \-q +Disable ballooning title changes (quiet) +.TP +.B \-t +Remove this application from the task bar +.TP +.B \-v, \-\-version +Show version of program. +.TP +.B \-w "wid" +Window id of the application to dock +.br +.SH AUTHOR +tdedocker was written by Girish Ramakrishnan (gramakri@uiuc.edu). +.PP +This manual page was written by Lorenzo Villani , +for the Ubuntu project (but may be used by others). diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 30f4c63..2c55b10 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -42,4 +42,3 @@ tde_add_executable( tdedocker AUTOMOC DESTINATION ${BIN_INSTALL_DIR} ) -