1.1 --- a/mapeditor.cpp Thu Apr 02 09:57:36 2009 +0000
1.2 +++ b/mapeditor.cpp Mon Apr 06 08:40:11 2009 +0000
1.3 @@ -4631,8 +4631,25 @@
1.4 {
1.5 if (mainWindow->getModMode()==Main::ModModeColor)
1.6 {
1.7 - pickingColor=true;
1.8 - setCursor (PickColorCursor);
1.9 + pickingColor=true;
1.10 + setCursor (PickColorCursor);
1.11 + return;
1.12 + }
1.13 + if (mainWindow->getModMode()==Main::ModModeCopy)
1.14 + {
1.15 + if (lmo && (typeid(*lmo)==typeid(BranchObj) ||
1.16 + typeid(*lmo)==typeid(MapCenterObj) ))
1.17 + {
1.18 +
1.19 + selectInt (lmo);
1.20 + copy();
1.21 + if (lmo->getDepth()>0) select (lmo->getParObj() );
1.22 + paste();
1.23 + cout << "sel 1="<<getSelectedBranch()->getHeading().toStdString()<<endl;
1.24 + lmo=getSelectedBranch()->getLastBranch();
1.25 + cout << "sel 2="<<getSelectedBranch()->getHeading().toStdString()<<endl;
1.26 + setCursor (Qt::ArrowCursor);
1.27 + } else
1.28 return;
1.29 }
1.30 if (mainWindow->getModMode()==Main::ModModeXLink)
1.31 @@ -4677,6 +4694,7 @@
1.32
1.33 // If modMode==copy, then we want to "move" the _new_ object around
1.34 // then we need the offset from p to the _old_ selection, because of tmp
1.35 + /*
1.36 if (mainWindow->getModMode()==Main::ModModeCopy &&
1.37 e->state() & Qt::ControlModifier)
1.38 {
1.39 @@ -4690,6 +4708,7 @@
1.40 model->reposition();
1.41 }
1.42 }
1.43 + */
1.44
1.45 movingObj=xelection.single();
1.46 } else