Hi,
Hopefully I'm not going to annoy anyone with a plug for my own software, but please have a look for eDiveSoftware (I can't post links yet here which is fair enough).
This is for dive planning, logging, dive sites, diver management, equipment management, buoyancy calculations and a whole lot more. We launched last year and are trying to get ourselves known bit by bit. You can download a copy and install and try it with no obligation as it will let you run it 30 times without needing to contact us. If you register via our site, we will be happy to extend this period for you for 2 months so you can have a play. It's the full app for the trial.
The app currently ships with US Navy tables, but works with PADI, NAUI, BSAC etc... provided certain formatting is adhered to. We have several videos on YouTube (search for Dive Planning).
The software has been independently checked by download.com and softpedia.com to be free of viruses, malware and the like.
Some webinars are coming up detailing how to use the app etc...
Please feel free to send constructive comments and feedback to us.
Ryan