--- mcore-src/trunk/mcore-tools/src/modules/fluxbox/fluxbox.client.class.in 2014/01/14 13:31:36 2276 +++ mcore-src/trunk/mcore-tools/src/modules/fluxbox/fluxbox.client.class.in 2014/01/14 14:36:04 2277 @@ -40,18 +40,15 @@ add) [[ -z ${name} ]] && help_fluxbox_menuitem && return 1 [[ -z ${exec} ]] && help_fluxbox_menuitem && return 1 - CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu/${name}" - clearconfig - addconfig "[exec] (${name}) {${exec}}" + ${MCORE_LIBDIR}/fluxbox-menuitem --add --name "${name}" --exec "${exec}" ;; del) - if [[ -f ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu/${name} ]] - then - rm ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu/"${name}" - elif [[ -z ${name} ]] + if [[ -n ${name} ]] then + ${MCORE_LIBDIR}/fluxbox-menuitem --del --name "${name}" + else # delete all items - find ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu -type f | xargs --no-run-if-empty rm + ${MCORE_LIBDIR}/fluxbox-menuitem --del fi ;; *) @@ -60,13 +57,13 @@ esac # rebuild the menu now - fluxbox-rebuild-menu + ${MCORE_LIBDIR}/fluxbox-rebuild-menu } # get_fluxbox_menuitem get_fluxbox_menuitem() { - list_files_in_directory ${MROOT}/${MCORE_CONFIG_PATH}/fluxbox/menu + ${MCORE_LIBDIR}/fluxbox-menuitem --print } help_fluxbox_theme()