Royal Mile has to be the best shop to visit, but The Whisky Shop in the precinct next to the station is pretty friendly and has a good, tightly packed, selection. Some good high end (expensive) stuff as well (knowing your tastes Ann-Helen...)
The Whisky Shop isn't in Princess Mall any more, at least they weren't in June as they were remodelling the mall then. The two I know of, one is on Princess Street west and the other is on the other side of the castle at 28 Victoria Street, actually just a stones throw from Royal Mile Whiskies. Another shop that can't be missed for the whisky enthusiast is the Cadenhead Shop
about 4~5 blocks down from RMW at 172 Canongate. Actually its easier to walk there first (using North Bridge) and then up to RMW, Cockburn St. (what r900p is talking about) is a real
bear (if in a car check your brakes first!), although there are some really neat shops there up along the way.
I haven't seen the toy department at Jenners but I'll bet it's tops, it's a big store (4 floors?) with lots to look at and buy. The top floor has a very nice gormeut food shop and the 1st floor is a womans Mecca
with tons of stuff packed inbetween. 1st class!