There is an application called Paint.NET which gives you total control over your images. As you will see in the image below, the application features all the requested functions (add shapes, forms, lines, text, etc). I have created a sample where you can see the features in action. Basically, what you've requested can be achieved using the tools in the red square. The T, line, and shapes activate various functions to add elements.