Magellan Linux

Diff of /mcore-src/trunk/mcore-tools/src/modules/fluxbox/fluxbox.client.class.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

mcore-src/trunk/mcore-tools/daemon/client/include/fluxbox.client.class revision 2015 by niro, Mon Aug 13 10:05:03 2012 UTC mcore-src/trunk/mcore-tools/src/modules/fluxbox/fluxbox.client.class.in revision 2153 by niro, Fri Jan 10 13:43:12 2014 UTC
# Line 10  helper_rebuild_fluxbox_menu() Line 10  helper_rebuild_fluxbox_menu()
10  {  {
11   local MMINCLUDE   local MMINCLUDE
12   local CONFIG   local CONFIG
13     local file
14     local ver
15    
16   MMINCLUDE="${MCORE_CONFIG_PATH}/fluxbox/mcore-menu-include"   MMINCLUDE="${MCORE_CONFIG_PATH}/fluxbox/mcore-menu-include"
17   CONFIG="${MROOT}/${MMINCLUDE}"   CONFIG="${MROOT}/${MMINCLUDE}"
# Line 29  helper_rebuild_fluxbox_menu() Line 31  helper_rebuild_fluxbox_menu()
31    
32   # fluxbox menu header   # fluxbox menu header
33   clearconfig   clearconfig
34   local ver="$(< ${MROOT}/etc/mageversion)"   ver="$(< ${MROOT}/etc/mageversion)"
35   addconfig "[begin] (mCore-${ver}  #${MCORE_SERIAL})"   addconfig "[begin] (${MCORE_DISTRIBUTION}-${ver}  #${MCORE_SERIAL})"
36    
37   # add a newline (maybe there is no crlf in the header)   # add a newline (maybe there is no crlf in the header)
38   addconfig   addconfig
# Line 110  set_fluxbox_menuitem() Line 112  set_fluxbox_menuitem()
112   elif [[ -z ${name} ]]   elif [[ -z ${name} ]]
113   then   then
114   # delete all items   # delete all items
115   rm ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu/*   find ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu -type f | xargs --no-run-if-empty rm
116   fi   fi
117   ;;   ;;
118   *)   *)
# Line 143  help_fluxbox_theme() Line 145  help_fluxbox_theme()
145  set_fluxbox_theme()  set_fluxbox_theme()
146  {  {
147   local theme="$1"   local theme="$1"
148   local stylesdir="/usr/share/fluxbox/styles"   local stylesdir="@@DATADIR@@/fluxbox/styles"
149    
150   [[ -z ${theme} ]] && help_fluxbox_theme && return 1   [[ -z ${theme} ]] && help_fluxbox_theme && return 1
151   [[ ! -x $(which fluxbox-remote) ]] && eecho "fluxbox-remote missing! Aborted" && return 1   [[ ! -x $(type -P fluxbox-remote) ]] && eecho "fluxbox-remote missing! Aborted" && return 1
152    
153   if [[ -e ${stylesdir}/${theme} ]]   if [[ -e ${stylesdir}/${theme} ]]
154   then   then
155   x11runas "fluxbox-remote 'SetStyle ${stylesdir}/${theme}'"   x11runas "fluxbox-remote 'SetStyle ${stylesdir}/${theme}'"
156   else   else
157   eechoe "Theme '${theme}' does not exist!"   eecho "Theme '${theme}' does not exist!"
158   fi   fi
159  }  }
160    
161  get_fluxbox_theme()  get_fluxbox_theme()
162  {  {
163   local method="$1"   local method="$1"
164   local stylesdir="/usr/share/fluxbox/styles"   local stylesdir="@@DATADIR@@/fluxbox/styles"
165   local value   local value
166   local i   local i
167    

Legend:
Removed from v.2015  
changed lines
  Added in v.2153