Magellan Linux

  • Back to homepage
    • /[mcore-svn]/mcore-src/trunk/mcore-tools/daemon/client/include/fluxbox.client.class

    Diff of /mcore-src/trunk/mcore-tools/daemon/client/include/fluxbox.client.class

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

    revision 1919 by niro, Wed Nov 9 13:33:26 2011 UTC revision 2014 by niro, Mon Aug 13 10:02:37 2012 UTC
    # Line 12  helper_rebuild_fluxbox_menu() Line 12  helper_rebuild_fluxbox_menu()
    12   local CONFIG   local CONFIG
    13    
    14   MMINCLUDE="${MCORE_CONFIG_PATH}/fluxbox/mcore-menu-include"   MMINCLUDE="${MCORE_CONFIG_PATH}/fluxbox/mcore-menu-include"
    15   CONFIG="${MMINCLUDE}"   CONFIG="${MROOT}/${MMINCLUDE}"
    16   clearconfig   clearconfig
    17    
    18   for file in ${MCORE_CONFIG_PATH}/fluxbox/menu/*   for file in ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu/*
    19   do   do
    20     [[ ! -z ${MROOT} ]] && file=$(echo ${file} | sed "s:${MROOT}::")
    21   addconfig "[include] (${file})"   addconfig "[include] (${file})"
    22   done   done
    23    
    24   # rebuild the user menu too atm   # rebuild the user menu too atm
    25   CONFIG="${MCORE_UNPRIV_HOME}/.fluxbox/menu"   CONFIG="${MROOT}/${MCORE_UNPRIV_HOME}/.fluxbox/menu"
    26   if [[ ! -d ${MCORE_UNPRIV_HOME}/.fluxbox ]]   if [[ ! -d ${MROOT}/${MCORE_UNPRIV_HOME}/.fluxbox ]]
    27   then   then
    28   install -o ${MCORE_UNPRIV_USER} -o ${MCORE_UNPRIV_GROUP} -d ${MCORE_UNPRIV_HOME}/.fluxbox   install -o ${MCORE_UNPRIV_USER} -o ${MCORE_UNPRIV_GROUP} -d ${MROOT}/${MCORE_UNPRIV_HOME}/.fluxbox
    29   fi   fi
    30    
    31   # fluxbox menu header   # fluxbox menu header
    32   clearconfig   clearconfig
    33   local ver="$(< /etc/mageversion)"   local ver="$(< ${MROOT}/etc/mageversion)"
    34   addconfig "[begin] (mCore-${ver}  #${MCORE_SERIAL})"   addconfig "[begin] (mCore-${ver}  #${MCORE_SERIAL})"
    35    
    36   # add a newline (maybe there is no crlf in the header)   # add a newline (maybe there is no crlf in the header)
    # Line 53  helper_rebuild_fluxbox_autostart() Line 54  helper_rebuild_fluxbox_autostart()
    54  {  {
    55   local CONFIG   local CONFIG
    56    
    57   CONFIG="${MCORE_UNPRIV_HOME}/.fluxbox/apps"   CONFIG="${MROOT}/${MCORE_UNPRIV_HOME}/.fluxbox/apps"
    58   clearconfig   clearconfig
    59   for file in ${MCORE_CONFIG_PATH}/fluxbox/autostart/*   for file in ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/autostart/*
    60   do   do
    61   addconfig "$(< ${file})"   addconfig "$(< ${file})"
    62   done   done
    # Line 99  set_fluxbox_menuitem() Line 100  set_fluxbox_menuitem()
    100   add)   add)
    101   [[ -z ${name} ]] && help_fluxbox_menuitem && return 1   [[ -z ${name} ]] && help_fluxbox_menuitem && return 1
    102   [[ -z ${exec} ]] && help_fluxbox_menuitem && return 1   [[ -z ${exec} ]] && help_fluxbox_menuitem && return 1
    103   CONFIG="${MCORE_CONFIG_PATH}/fluxbox/menu/${name}"   CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu/${name}"
    104   clearconfig   clearconfig
    105   addconfig "[exec] (${name}) {${exec}}"   addconfig "[exec] (${name}) {${exec}}"
    106   ;;   ;;
    107   del)   del)
    108   if [[ -f ${MCORE_CONFIG_PATH}/fluxbox/menu/${name} ]]   if [[ -f ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu/${name} ]]
    109   then   then
    110   rm ${MCORE_CONFIG_PATH}/fluxbox/menu/"${name}"   rm ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu/"${name}"
    111   elif [[ -z ${name} ]]   elif [[ -z ${name} ]]
    112   then   then
    113   # delete all items   # delete all items
    114   rm ${MCORE_CONFIG_PATH}/fluxbox/menu/*   rm ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu/*
    115   fi   fi
    116   ;;   ;;
    117   *)   *)
    # Line 125  set_fluxbox_menuitem() Line 126  set_fluxbox_menuitem()
    126  # get_fluxbox_menuitem  # get_fluxbox_menuitem
    127  get_fluxbox_menuitem()  get_fluxbox_menuitem()
    128  {  {
    129   local i   list_files_in_directory ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu
      local item  
       
      for i in $(find ${MCORE_CONFIG_PATH}/fluxbox/menu -type f | sort)  
      do  
      item="${item} $(basename ${i})"  
      done  
       
      rvecho "${item}"  
    130  }  }
    131    
    132  help_fluxbox_theme()  help_fluxbox_theme()
    # Line 175  get_fluxbox_theme() Line 168  get_fluxbox_theme()
    168    
    169   case "${method}" in   case "${method}" in
    170   system)   system)
    171   for i in $(find ${stylesdir} -mindepth 1 -maxdepth 1 | sort)   list_files_in_directory -type d -mindepth 1 -maxdepth 1 ${MROOT}/${stylesdir}
      do  
      value="${value} $(basename ${i})"  
      done  
      rvecho "${value}"  
    172   ;;   ;;
    173    
    174   current)   current)
    175   value=$(grep -i '^session.stylefile' ${MCORE_UNPRIV_HOME}/.fluxbox/init | sed 's:.*/\(.*\):\1:')   value=$(grep -i '^session.stylefile' ${MROOT}/${MCORE_UNPRIV_HOME}/.fluxbox/init | sed 's:.*/\(.*\):\1:')
    176   rvecho "${value}"   rvecho "${value}"
    177   ;;   ;;
    178   *) help_fluxbox_theme && return 1 ;;   *) help_fluxbox_theme && return 1 ;;
    Legend:
    Removed from v.1919  
    changed lines
      Added in v.2014