1.1 --- a/mainwindow.cpp	Fri Dec 29 13:52:19 2006 +0000
     1.2 +++ b/mainwindow.cpp	Fri Jan 05 11:17:32 2007 +0000
     1.3 @@ -791,20 +791,20 @@
     1.4  	actionListBranches.append(a);
     1.5  	actionFormatPickColor=a;
     1.6  
     1.7 -    a= new QAction(QPixmap(iconPath+"formatcoloritem.png"), tr( "Color &branch","Edit menu" ), this);
     1.8 +    a= new QAction(QPixmap(iconPath+"formatcolorbranch.png"), tr( "Color &branch","Edit menu" ), this);
     1.9  	a->setStatusTip ( tr( "Color branch" ) );
    1.10  	a->setShortcut (Qt::CTRL + Qt::Key_I);
    1.11 -    connect( a, SIGNAL( triggered() ), this, SLOT( formatColorItem() ) );
    1.12 +    connect( a, SIGNAL( triggered() ), this, SLOT( formatColorBranch() ) );
    1.13  	a->setEnabled (false);
    1.14      a->addTo( tb );
    1.15  	formatMenu->addAction (a);
    1.16  	actionListBranches.append(a);
    1.17 -	actionFormatColorBranch=a;
    1.18 -
    1.19 -    a= new QAction(QPixmap(iconPath+"formatcolorbranch.png"), tr( "Color sub&tree","Edit menu" ), this);
    1.20 +	actionFormatColorSubtree=a;
    1.21 +
    1.22 +    a= new QAction(QPixmap(iconPath+"formatcolorsubtree.png"), tr( "Color sub&tree","Edit menu" ), this);
    1.23  	a->setStatusTip ( tr( "Color Subtree" ));
    1.24  	a->setShortcut (Qt::CTRL + Qt::Key_T);
    1.25 -    connect( a, SIGNAL( triggered() ), this, SLOT( formatColorBranch() ) );
    1.26 +    connect( a, SIGNAL( triggered() ), this, SLOT( formatColorSubtree() ) );
    1.27  	a->setEnabled (false);
    1.28  	formatMenu->addAction (a);
    1.29      a->addTo( tb );
    1.30 @@ -2997,18 +2997,18 @@
    1.31  	currentColor=c;
    1.32  }
    1.33  
    1.34 -void Main::formatColorItem()
    1.35 -{
    1.36 -	if (currentMapEditor())
    1.37 -		currentMapEditor()->colorItem(currentColor);
    1.38 -}
    1.39 -
    1.40  void Main::formatColorBranch()
    1.41  {
    1.42  	if (currentMapEditor())
    1.43  		currentMapEditor()->colorBranch(currentColor);
    1.44  }
    1.45  
    1.46 +void Main::formatColorSubtree()
    1.47 +{
    1.48 +	if (currentMapEditor())
    1.49 +		currentMapEditor()->colorSubtree (currentColor);
    1.50 +}
    1.51 +
    1.52  void Main::formatLinkStyleLine()
    1.53  {
    1.54  	if (currentMapEditor())
    1.55 @@ -3093,7 +3093,6 @@
    1.56  		QMatrix m;
    1.57  		m.reset();
    1.58  		currentMapEditor()->setMatrix( m );
    1.59 -		currentMapEditor()->setViewCenter();
    1.60  	}	
    1.61  }
    1.62  
    1.63 @@ -3104,7 +3103,6 @@
    1.64  		QMatrix m = currentMapEditor()->matrix();
    1.65  		m.scale( 1.25, 1.25 );
    1.66  		currentMapEditor()->setMatrix( m );
    1.67 -		currentMapEditor()->setViewCenter();
    1.68  	}	
    1.69  }
    1.70  
    1.71 @@ -3115,7 +3113,6 @@
    1.72  		QMatrix m = currentMapEditor()->matrix();
    1.73  		m.scale( 0.8, 0.8 );
    1.74  		currentMapEditor()->setMatrix( m );
    1.75 -		currentMapEditor()->setViewCenter();
    1.76  	}	
    1.77  }
    1.78