1.1 --- a/mainwindow.cpp Tue Mar 31 15:36:10 2009 +0000
1.2 +++ b/mainwindow.cpp Wed Apr 01 15:06:57 2009 +0000
1.3 @@ -8,6 +8,7 @@
1.4
1.5 #include "aboutdialog.h"
1.6 #include "branchpropwindow.h"
1.7 +#include "branchitem.h"
1.8 #include "exportoofiledialog.h"
1.9 #include "exports.h"
1.10 #include "file.h"
1.11 @@ -2888,7 +2889,7 @@
1.12 stats+=QString ("%1 notes\n").arg (n,6);
1.13 stats+=QString ("%1 images\n").arg (f,6);
1.14 */
1.15 - stats+=QString ("%1 branches\n").arg (m->countBranches(),6);
1.16 + stats+=QString ("%1 branches\n").arg (m->branchCount(),6);
1.17 dia.setStats (stats);
1.18
1.19 // Finally show dialog
1.20 @@ -3608,8 +3609,10 @@
1.21 if ( (typeid(*selection) == typeid(BranchObj)) ||
1.22 (typeid(*selection) == typeid(MapCenterObj)) )
1.23 {
1.24 + BranchItem *bi=(BranchItem*)(selection->getTreeItem() );
1.25 BranchObj *bo=(BranchObj*)selection;
1.26 - // Take care of links
1.27 + // Take care of links // FIXME-1
1.28 + /*
1.29 if (bo->countXLinks()==0)
1.30 {
1.31 branchXLinksContextMenuEdit->clear();
1.32 @@ -3633,11 +3636,12 @@
1.33 }
1.34 }
1.35 }
1.36 + */
1.37
1.38 standardFlagsDefault->setEnabled (true);
1.39
1.40 actionToggleScroll->setEnabled (true);
1.41 - if ( bo->isScrolled() )
1.42 + if ( bi->isScrolled() )
1.43 actionToggleScroll->setOn(true);
1.44 else
1.45 actionToggleScroll->setOn(false);