Added support to select type of shape to draw in the menu bar.

Added a shapes sub-menu in the draw menu. The type of shape can be
selected from this submenu and is used for drawing. Rough
implementation. Needs to be cleaned up.