Magellan Linux

  • Back to homepage
    • /[mcore-svn]/mcore-src/trunk/mcore-tools/src/modules/idesk/idesk-generate-all-desktop-icons.in

    Diff of /mcore-src/trunk/mcore-tools/src/modules/idesk/idesk-generate-all-desktop-icons.in

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

    revision 2367 by niro, Tue Aug 25 10:28:36 2015 UTC revision 2397 by niro, Fri Aug 28 09:12:06 2015 UTC
    # Line 24  eval $(x11runas xinfo) Line 24  eval $(x11runas xinfo)
    24  xres="${xorg_width}"  xres="${xorg_width}"
    25  yres="${xorg_height}"  yres="${xorg_height}"
    26    
    27    # fallback to 800x600
    28    [[ -z ${xres} ]] && xres="800"
    29    [[ -z ${yres} ]] && xres="600"
    30    
    31  # top left edge of the icon is given in config file  # top left edge of the icon is given in config file
    32  # remove a little bit to simulate the bottom-right edge  # remove a little bit to simulate the bottom-right edge
    33  xres="$(( ${xres} - 120 ))"  xres="$(( ${xres} - 120 ))"
    # Line 34  yres="$(( ${yres} - 80 ))" Line 38  yres="$(( ${yres} - 80 ))"
    38  [ -f ${rc} ] && rm -f ${rc}  [ -f ${rc} ] && rm -f ${rc}
    39  install -d ${dest}  install -d ${dest}
    40    
    41    # clean default reboot,shutdown icon info
    42    for i in shutdown reboot
    43    do
    44     if [ -f ${MROOT}/${MCORE_CONFIG_PATH}/icons/info/${i}.${ICON_INFO_SUFFIX} ]
    45     then
    46     rm ${MROOT}/${MCORE_CONFIG_PATH}/icons/info/${i}.${ICON_INFO_SUFFIX}
    47     fi
    48    done
    49    
    50  # default settings  # default settings
    51  declare -i x=50  declare -i x=50
    52  declare -i y=50  declare -i y=50
    # Line 60  do Line 73  do
    73   [ ${x} -ge ${xres} ] && x=50   [ ${x} -ge ${xres} ] && x=50
    74   fi   fi
    75    
    76   ${MCORE_LIBDIR}/idesk-generate-icon --resource "${icon_resource}" --xres "${x}" --yres "${y}"   ${MCORE_LIBDIR}/idesk-generate-icon --add --resource "${icon_resource}" --xres "${x}" --yres "${y}"
    77    
    78   y=$((${y} + 80))   y=$((${y} + 80))
    79  done  done
    # Line 91  do Line 104  do
    104   esac   esac
    105    
    106   ${MCORE_LIBDIR}/idesk-generate-icon \   ${MCORE_LIBDIR}/idesk-generate-icon \
    107     --add \
    108   --name "${name}" \   --name "${name}" \
    109   --command "sudo /usr/sbin/${cmd}" \   --command "sudo /usr/sbin/${cmd}" \
    110   --icon "${i}.png" \   --icon "${i}.png" \
    # Line 103  do Line 117  do
    117   y=$((${y} + 80))   y=$((${y} + 80))
    118  done  done
    119    
       
    120  # restart idesk  # restart idesk
    121  killall idesk; x11runas "nohup idesk > /dev/null &"  killall idesk; x11runas "nohup idesk > /dev/null &"
    Legend:
    Removed from v.2367  
    changed lines
      Added in v.2397