diff -r fe839bdfd10c -r 6cbf3c9cbd21 vymmodel.cpp --- a/vymmodel.cpp Tue Jul 07 11:21:27 2009 +0000 +++ b/vymmodel.cpp Wed Jul 22 11:48:23 2009 +0000 @@ -22,6 +22,8 @@ extern bool debug; extern Main *mainWindow; +extern QDBusConnection dbusConnection; + extern Settings settings; extern QString tmpVymDir; @@ -148,6 +150,12 @@ // Create MapCenter // addMapCenter(); FIXME-2 VM create this in MapEditor until BO and MCO are independent of scene + //Initialize DBUS + //new CarAdaptor(car); + //connection.registerObject("/Car", car); + dbusConnection.registerService("org.insilmaril.vym"); + + } void VymModel::makeTmpDirectories() @@ -2169,7 +2177,13 @@ emit (layoutChanged() ); reposition(); // both for moveUp/Down and relinking - select (branch); + if (dst->isScrolled() ) + { + select (dst); + branch->updateVisibility(); + } + else + select (branch); return true; } return false; @@ -2316,6 +2330,7 @@ beginRemoveRows (ix,0,n); removeRows (0,n+1,ix); endRemoveRows(); + if (selbi->isScrolled()) selbi->unScroll(); emit (layoutChanged() ); reposition(); }