From c66f9a0fd42315d3ba96c1e593330267d217a2aa Mon Sep 17 00:00:00 2001 From: o9000 Date: Tue, 8 Mar 2016 23:51:47 +0100 Subject: [PATCH] tint2conf: Support for loading themes from /usr/share/tint2 --- CMakeLists.txt | 10 +++++----- {sample => themes}/horizontal-dark-opaque.tint2rc | 0 {sample => themes}/horizontal-dark-transparent.tint2rc | 0 {sample => themes}/horizontal-light-opaque.tint2rc | 0 .../horizontal-light-transparent.tint2rc | 0 {sample => themes}/icon_and_text_1.tint2rc | 0 {sample => themes}/icon_and_text_2.tint2rc | 0 {sample => themes}/icon_and_text_3.tint2rc | 0 {sample => themes}/icon_and_text_4.tint2rc | 0 {sample => themes}/icon_only_1.tint2rc | 0 {sample => themes}/icon_only_2.tint2rc | 0 {sample => themes}/icon_only_3.tint2rc | 0 {sample => themes}/icon_only_4.tint2rc | 0 {sample => themes}/icon_only_6.tint2rc | 0 {sample => themes}/icon_only_7.tint2rc | 0 {sample => themes}/text_only_1.tint2rc | 0 {sample => themes}/text_only_2.tint2rc | 0 {sample => themes}/text_only_3.tint2rc | 0 {sample => themes}/text_only_4.tint2rc | 0 {sample => themes}/text_only_5.tint2rc | 0 {sample => themes}/text_only_6.tint2rc | 0 {sample => themes}/tint2rc | 0 {sample => themes}/vertical-dark-opaque.tint2rc | 0 {sample => themes}/vertical-dark-transparent.tint2rc | 0 {sample => themes}/vertical-light-opaque.tint2rc | 0 {sample => themes}/vertical-light-transparent.tint2rc | 0 26 files changed, 5 insertions(+), 5 deletions(-) rename {sample => themes}/horizontal-dark-opaque.tint2rc (100%) rename {sample => themes}/horizontal-dark-transparent.tint2rc (100%) rename {sample => themes}/horizontal-light-opaque.tint2rc (100%) rename {sample => themes}/horizontal-light-transparent.tint2rc (100%) rename {sample => themes}/icon_and_text_1.tint2rc (100%) rename {sample => themes}/icon_and_text_2.tint2rc (100%) rename {sample => themes}/icon_and_text_3.tint2rc (100%) rename {sample => themes}/icon_and_text_4.tint2rc (100%) rename {sample => themes}/icon_only_1.tint2rc (100%) rename {sample => themes}/icon_only_2.tint2rc (100%) rename {sample => themes}/icon_only_3.tint2rc (100%) rename {sample => themes}/icon_only_4.tint2rc (100%) rename {sample => themes}/icon_only_6.tint2rc (100%) rename {sample => themes}/icon_only_7.tint2rc (100%) rename {sample => themes}/text_only_1.tint2rc (100%) rename {sample => themes}/text_only_2.tint2rc (100%) rename {sample => themes}/text_only_3.tint2rc (100%) rename {sample => themes}/text_only_4.tint2rc (100%) rename {sample => themes}/text_only_5.tint2rc (100%) rename {sample => themes}/text_only_6.tint2rc (100%) rename {sample => themes}/tint2rc (100%) rename {sample => themes}/vertical-dark-opaque.tint2rc (100%) rename {sample => themes}/vertical-dark-transparent.tint2rc (100%) rename {sample => themes}/vertical-light-opaque.tint2rc (100%) rename {sample => themes}/vertical-light-transparent.tint2rc (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index d9d294a..af1afc0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required( VERSION 2.6 ) option( ENABLE_BATTERY "Enable battery status plugin" ON ) option( ENABLE_TINT2CONF "Enable tint2conf build, a GTK+2 theme configurator for tint2" ON ) -option( ENABLE_EXAMPLES "Install additional tin2rc examples" ON ) +option( ENABLE_EXTRA_THEMES "Install additional tint2 themes" ON ) option( ENABLE_RSVG "Rsvg support (launcher only)" ON ) option( ENABLE_SN "Startup notification support" ON ) option( ENABLE_ASAN "Build tint2 with AddressSanitizer" OFF ) @@ -242,11 +242,11 @@ install( TARGETS tint2 DESTINATION bin ) install( FILES tint2.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps ) install( FILES tint2.desktop DESTINATION ${DATADIR}/applications ) install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" ) -install( FILES sample/tint2rc DESTINATION ${SYSCONFDIR}/xdg/tint2 ) +install( FILES themes/tint2rc DESTINATION ${SYSCONFDIR}/xdg/tint2 ) install( FILES default_icon.png DESTINATION ${DATADIR}/tint2 ) install( FILES AUTHORS ChangeLog README.md DESTINATION ${DOCDIR} ) install( FILES doc/tint2.1 DESTINATION ${MANDIR}/man1 ) -if( ENABLE_EXAMPLES ) - file( GLOB SAMPLEFILES sample/*.tint2rc ) - install( FILES ${SAMPLEFILES} DESTINATION ${DATADIR}/tint2 ) +if( ENABLE_EXTRA_THEMES ) + file( GLOB EXTRATHEMEFILES themes/*.tint2rc ) + install( FILES ${EXTRATHEMEFILES} DESTINATION ${DATADIR}/tint2 ) endif( ENABLE_EXAMPLES ) diff --git a/sample/horizontal-dark-opaque.tint2rc b/themes/horizontal-dark-opaque.tint2rc similarity index 100% rename from sample/horizontal-dark-opaque.tint2rc rename to themes/horizontal-dark-opaque.tint2rc diff --git a/sample/horizontal-dark-transparent.tint2rc b/themes/horizontal-dark-transparent.tint2rc similarity index 100% rename from sample/horizontal-dark-transparent.tint2rc rename to themes/horizontal-dark-transparent.tint2rc diff --git a/sample/horizontal-light-opaque.tint2rc b/themes/horizontal-light-opaque.tint2rc similarity index 100% rename from sample/horizontal-light-opaque.tint2rc rename to themes/horizontal-light-opaque.tint2rc diff --git a/sample/horizontal-light-transparent.tint2rc b/themes/horizontal-light-transparent.tint2rc similarity index 100% rename from sample/horizontal-light-transparent.tint2rc rename to themes/horizontal-light-transparent.tint2rc diff --git a/sample/icon_and_text_1.tint2rc b/themes/icon_and_text_1.tint2rc similarity index 100% rename from sample/icon_and_text_1.tint2rc rename to themes/icon_and_text_1.tint2rc diff --git a/sample/icon_and_text_2.tint2rc b/themes/icon_and_text_2.tint2rc similarity index 100% rename from sample/icon_and_text_2.tint2rc rename to themes/icon_and_text_2.tint2rc diff --git a/sample/icon_and_text_3.tint2rc b/themes/icon_and_text_3.tint2rc similarity index 100% rename from sample/icon_and_text_3.tint2rc rename to themes/icon_and_text_3.tint2rc diff --git a/sample/icon_and_text_4.tint2rc b/themes/icon_and_text_4.tint2rc similarity index 100% rename from sample/icon_and_text_4.tint2rc rename to themes/icon_and_text_4.tint2rc diff --git a/sample/icon_only_1.tint2rc b/themes/icon_only_1.tint2rc similarity index 100% rename from sample/icon_only_1.tint2rc rename to themes/icon_only_1.tint2rc diff --git a/sample/icon_only_2.tint2rc b/themes/icon_only_2.tint2rc similarity index 100% rename from sample/icon_only_2.tint2rc rename to themes/icon_only_2.tint2rc diff --git a/sample/icon_only_3.tint2rc b/themes/icon_only_3.tint2rc similarity index 100% rename from sample/icon_only_3.tint2rc rename to themes/icon_only_3.tint2rc diff --git a/sample/icon_only_4.tint2rc b/themes/icon_only_4.tint2rc similarity index 100% rename from sample/icon_only_4.tint2rc rename to themes/icon_only_4.tint2rc diff --git a/sample/icon_only_6.tint2rc b/themes/icon_only_6.tint2rc similarity index 100% rename from sample/icon_only_6.tint2rc rename to themes/icon_only_6.tint2rc diff --git a/sample/icon_only_7.tint2rc b/themes/icon_only_7.tint2rc similarity index 100% rename from sample/icon_only_7.tint2rc rename to themes/icon_only_7.tint2rc diff --git a/sample/text_only_1.tint2rc b/themes/text_only_1.tint2rc similarity index 100% rename from sample/text_only_1.tint2rc rename to themes/text_only_1.tint2rc diff --git a/sample/text_only_2.tint2rc b/themes/text_only_2.tint2rc similarity index 100% rename from sample/text_only_2.tint2rc rename to themes/text_only_2.tint2rc diff --git a/sample/text_only_3.tint2rc b/themes/text_only_3.tint2rc similarity index 100% rename from sample/text_only_3.tint2rc rename to themes/text_only_3.tint2rc diff --git a/sample/text_only_4.tint2rc b/themes/text_only_4.tint2rc similarity index 100% rename from sample/text_only_4.tint2rc rename to themes/text_only_4.tint2rc diff --git a/sample/text_only_5.tint2rc b/themes/text_only_5.tint2rc similarity index 100% rename from sample/text_only_5.tint2rc rename to themes/text_only_5.tint2rc diff --git a/sample/text_only_6.tint2rc b/themes/text_only_6.tint2rc similarity index 100% rename from sample/text_only_6.tint2rc rename to themes/text_only_6.tint2rc diff --git a/sample/tint2rc b/themes/tint2rc similarity index 100% rename from sample/tint2rc rename to themes/tint2rc diff --git a/sample/vertical-dark-opaque.tint2rc b/themes/vertical-dark-opaque.tint2rc similarity index 100% rename from sample/vertical-dark-opaque.tint2rc rename to themes/vertical-dark-opaque.tint2rc diff --git a/sample/vertical-dark-transparent.tint2rc b/themes/vertical-dark-transparent.tint2rc similarity index 100% rename from sample/vertical-dark-transparent.tint2rc rename to themes/vertical-dark-transparent.tint2rc diff --git a/sample/vertical-light-opaque.tint2rc b/themes/vertical-light-opaque.tint2rc similarity index 100% rename from sample/vertical-light-opaque.tint2rc rename to themes/vertical-light-opaque.tint2rc diff --git a/sample/vertical-light-transparent.tint2rc b/themes/vertical-light-transparent.tint2rc similarity index 100% rename from sample/vertical-light-transparent.tint2rc rename to themes/vertical-light-transparent.tint2rc