diff -r 922d7f6c4e6c -r 1cc7bbf75f0b mainwindow.cpp --- a/mainwindow.cpp Fri Dec 29 13:52:19 2006 +0000 +++ b/mainwindow.cpp Fri Jan 05 11:17:32 2007 +0000 @@ -791,20 +791,20 @@ actionListBranches.append(a); actionFormatPickColor=a; - a= new QAction(QPixmap(iconPath+"formatcoloritem.png"), tr( "Color &branch","Edit menu" ), this); + a= new QAction(QPixmap(iconPath+"formatcolorbranch.png"), tr( "Color &branch","Edit menu" ), this); a->setStatusTip ( tr( "Color branch" ) ); a->setShortcut (Qt::CTRL + Qt::Key_I); - connect( a, SIGNAL( triggered() ), this, SLOT( formatColorItem() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( formatColorBranch() ) ); a->setEnabled (false); a->addTo( tb ); formatMenu->addAction (a); actionListBranches.append(a); - actionFormatColorBranch=a; - - a= new QAction(QPixmap(iconPath+"formatcolorbranch.png"), tr( "Color sub&tree","Edit menu" ), this); + actionFormatColorSubtree=a; + + a= new QAction(QPixmap(iconPath+"formatcolorsubtree.png"), tr( "Color sub&tree","Edit menu" ), this); a->setStatusTip ( tr( "Color Subtree" )); a->setShortcut (Qt::CTRL + Qt::Key_T); - connect( a, SIGNAL( triggered() ), this, SLOT( formatColorBranch() ) ); + connect( a, SIGNAL( triggered() ), this, SLOT( formatColorSubtree() ) ); a->setEnabled (false); formatMenu->addAction (a); a->addTo( tb ); @@ -2997,18 +2997,18 @@ currentColor=c; } -void Main::formatColorItem() -{ - if (currentMapEditor()) - currentMapEditor()->colorItem(currentColor); -} - void Main::formatColorBranch() { if (currentMapEditor()) currentMapEditor()->colorBranch(currentColor); } +void Main::formatColorSubtree() +{ + if (currentMapEditor()) + currentMapEditor()->colorSubtree (currentColor); +} + void Main::formatLinkStyleLine() { if (currentMapEditor()) @@ -3093,7 +3093,6 @@ QMatrix m; m.reset(); currentMapEditor()->setMatrix( m ); - currentMapEditor()->setViewCenter(); } } @@ -3104,7 +3103,6 @@ QMatrix m = currentMapEditor()->matrix(); m.scale( 1.25, 1.25 ); currentMapEditor()->setMatrix( m ); - currentMapEditor()->setViewCenter(); } } @@ -3115,7 +3113,6 @@ QMatrix m = currentMapEditor()->matrix(); m.scale( 0.8, 0.8 ); currentMapEditor()->setMatrix( m ); - currentMapEditor()->setViewCenter(); } }